Merge remote-tracking branch 'origin/pim_ywx' into pim_ywx

yaowanxin

5 天以前 ac135b66a5ab9f2f74c55961066974e815b88e9a

 src/main/java/com/ruoyi/project/system/controller/SysRoleController.java

@@ -45,10 +45,10 @@


    @Autowired

    private TokenService tokenService;

    


    @Autowired

    private SysPermissionService permissionService;

    


    @Autowired

    private ISysUserService userService;