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

zhanghua

2023-03-04 c81a5b4f6c18f01059a5012ce436f079a1ff840a

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

@@ -161,11 +161,13 @@
        if (status > 0) {
            return CommonResult.success(status);
        } else if (status == -1) {
            return CommonResult.failed("提交参数不合法");
            return CommonResult.failed("密码长度8到16位且密码中的字符必须包含字母（大写或者小写）和必须包含数字，不能包含空格");
        } else if (status == -2) {
            return CommonResult.failed("找不到该用户");
        } else if (status == -3) {
            return CommonResult.failed("旧密码错误");
        }else if (status == -4) {
            return CommonResult.failed("密码不能和登录名完全一致");
        } else {
            return CommonResult.failed();
        }