Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

whycq

2024-05-27 cb1db468bcaa90e9a0e2e4aee192088e9370ac52

 zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java

@@ -71,9 +71,9 @@
            return R.parse(CodeRes.USER_10003);
        }
        String system = null;//登陆系统
        if (wms) {
        if (wms != null && wms) {
            system = String.valueOf(LoginSystemType.WMS);
        }else {
        } else {
            system = String.valueOf(LoginSystemType.WCS);
        }
        String token = Cools.enToken(System.currentTimeMillis() + username, user.getPassword());