Merge remote-tracking branch 'origin/master'

aijinhui

2024-02-23 0abccf5e570dce53a802bca4ce25118dd900692c

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

@@ -63,7 +63,7 @@
     * 获取用户列表
     */
    @ApiOperation("获取用户列表")
    @PreAuthorize("@ss.hasPermi('system:user:list')")
//    @PreAuthorize("@ss.hasPermi('system:user:list')")
    @GetMapping("/list")
    public TableDataInfo list(SysUser user) {
        startPage();
@@ -265,4 +265,5 @@
            return Results.succeed("修改密码成功！");
        }
    }

}