Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2024-04-01 fec3ada961082e800ce7b102146ed5d2e12e563c

 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java

@@ -85,7 +85,6 @@
        String password = AesEncryptUtil.desEncrypt(umsAdminLoginParam.getPassword());
//        String password = umsAdminLoginParam.getPassword();
        String token = adminService.login(umsAdminLoginParam.getUsername(), password);

        if (token == null) {
            return CommonResult.validateFailed("用户名或密码错误");
        }