Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-01 8e524f6e570fca66f670a8072edefc6ca2d4e2f9

 cloud-server-management/src/main/webapp/static/modular/system/user/user.js

@@ -288,7 +288,7 @@
    if (this.check()) {
        var userId = this.seItem.id;
        if(language==1){
            parent.layer.confirm('是否重置密码为111111？', {
            parent.layer.confirm('是否重置密码为a123456？', {
                btn: ['确定', '取消'],
                shade: false //不显示遮罩
            }, function () {