Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-06 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0

 src/main/webapp/views/password.html

@@ -77,7 +77,7 @@
                if (val === ""){
                    // return "当前密码不能为空";
                }
                if (parent.$('#password').val() !== val) {
                if (parent.$('#password').val() !== hex_md5(val)) {
                    return "密码不匹配";
                }
            },
@@ -88,7 +88,7 @@
                if (val.length < 4) {
                    return "不能少于4个字符";
                }
                if (parent.$('#password').val() !== hex_md5(val)) {
                if (parent.$('#password').val() === hex_md5(val)) {
                    return "与旧密码不能相同";
                }
            },