Merge remote-tracking branch 'origin/master'

puzhibing

2023-02-22 85eab076207efee683efb6fd04b2ca48b24d797a

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java

@@ -180,6 +180,7 @@
                          Integer id,
                          Integer status) {
        EntityWrapper<TAppUser> wrapper = tAppUserService.getUserListWrapper(createTime,nickname,phone,id,status);
        wrapper.ne("is_exception",2);
        return tAppUserService.selectList(wrapper);
    }

@@ -213,7 +214,7 @@
    }

    /**
     * 修改
     * 修改用户状态
     */
    @RequestMapping(value = "/update-status")
    @ResponseBody
@@ -270,8 +271,8 @@
            String[] title = new String[] {"用户ID","用户昵称","手机号","性别","头像","微信openid",
                    "微信unionid","紧急联系人","紧急联系电话","账户余额","用户标签id","状态","添加时间"};
            EntityWrapper<TAppUser> wrapper = tAppUserService.getUserListWrapper(createTime,nickname,phone,id,status);
            wrapper.ne("is_exception",2);
            // 是否异常
            wrapper.eq("is_exception",2);
            List<TAppUser> list = tAppUserService.selectList(wrapper);

            String[][] values = new String[list.size()][];