Merge branch 'master' into dev/zlm

648540858

2024-04-09 b1b6fae22c5ab3013d73df1a43cd42f7fe0fa347

 src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java

@@ -51,7 +51,7 @@

        filterChain.doFilter(servletRequest, servletResponse);

        if (uriName != null && userSetting != null && userSetting.getLogInDatebase() != null && userSetting.getLogInDatebase()) {
        if (uriName != null && userSetting != null && userSetting.getLogInDatabase() != null && userSetting.getLogInDatabase()) {

            LogDto logDto = new LogDto();
            logDto.setName(uriName);