Merge remote-tracking branch 'origin/master'

aijinhui

2024-01-14 8a4810082529e48259ec332e034c05f1eea2399b

 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();