Merge remote-tracking branch 'origin/master'

puzhibing

2023-04-18 67bfacb03541ef2ee4c1496f4cc7600014cd1005

 management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js

@@ -56,7 +56,7 @@
            {title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
                formatter: function (value, row) {
                    if (row.status === 1){
                        return '<a href="#" onclick="TAppUser.stop('+row.id+','+row.status+')" style="color:red">停用</a>' +'&nbsp;' +
                        return '<a href="#" onclick="TAppUser.stop('+row.id+','+row.status+')" style="color:red">冻结</a>' +'&nbsp;' +
                        '<a href="#" onclick="TAppUser.searchTAppUserDetail('+row.id+','+row.status+')" style="color:green">详情</a>'
                    }else if (row.status === 2){
                        return '<a href="#" onclick="TAppUser.start('+row.id+','+row.status+')" style="color:green">启用</a>' +'&nbsp;' +