Merge remote-tracking branch 'origin/master'

xuhy

2025-03-06 3ae4185bbca1512fcdce9e461a3ed6160790242b

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

@@ -116,7 +116,7 @@
        return AjaxResult.success(roleService.selectRoleById(roleId));
    }

    @PreAuthorize("@ss.hasPermi('system:role:detail')")
//    @PreAuthorize("@ss.hasPermi('system:role:detail')")
    @ApiOperation("角色详情")
    @GetMapping("/roleInfo")
    public AjaxResult roleInfo(@RequestParam Long roleId)