Merge branch 'master' of http://git.cc-lotus.info/laboratory/ruoyi-project

java代码/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -50,7 +50,7 @@ public class SysRoleController extends BaseController
     @Autowired
     private ISysUserService userService;
 
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    // @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysRole role)
     {

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

@@ -56,7 +56,7 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    // @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user)
     {