Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-11-10 cbc9250b33a955bc919a6afc5d4101ef65bbfafa

 src/main/java/com/zy/crm/system/controller/UserController.java

@@ -137,6 +137,7 @@
            // todo: 修改关联数据的deptId字段
            cstmrService.updateDeptIdByUserId(user.getId(), user.getDeptId());
        }
        user.setNickname(user.getUsername());
        if (!userService.updateById(user)) {
            throw new CoolException("修改用户失败");
        }