Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

6 天以前 d8d34b1eda59c88f8de91d889165f63132a29499

 rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java

@@ -42,7 +42,6 @@
            "/pda/login",
            "/erp/**",
            "/login",
            "/**/download",
            "/register",
            "/druid/**",
            "/doc.html",
@@ -52,7 +51,8 @@
            "/v2/api-docs/**",
            "/v3/api-docs/**",
            "/swagger-ui/**",
            "/ws/**"
            "/ws/**",
            "/wcs/**"
    };

    @Resource