Merge remote-tracking branch 'origin/master'

fuliqi

2025-02-12 b17b0e4d165d3d5cc272bd796e0dc315847de1a9

 start/src/main/java/com/ycl/web/controller/system/SysUserController.java

@@ -55,7 +55,7 @@
    /**
     * 获取用户列表
     */
    @PreAuthorize("@ss.hasPermi('system:user:list')")
//    @PreAuthorize("@ss.hasPermi('system:user:list')")
    @GetMapping("/list")
    public TableDataInfo list(SysUser user) {
        startPage();
@@ -217,7 +217,7 @@
    /**
     * 获取部门树列表
     */
    @PreAuthorize("@ss.hasPermi('system:user:list')")
//    @PreAuthorize("@ss.hasPermi('system:user:list')")
    @GetMapping("/deptTree")
    public AjaxResult deptTree(SysDept dept) {
        return success(deptService.selectDeptTreeList(dept));