Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-23 b1f91d23c01266dda8cad34aa866bcac741a21cf

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -238,7 +238,13 @@
    public AjaxResult deptTree(SysDept dept) {
        return success(deptService.selectDeptTreeList(dept));
    }

    /**
     * 获取部门树列表
     */
    @GetMapping("/deptTree/noPerm")
    public AjaxResult deptTreeNoPerm(SysDept dept) {
        return success(deptService.selectDeptTreeList(dept));
    }
    /**
     * 修改密码
     */