Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -73,9 +73,8 @@
     * @return 权限列表
     */
    @Override
    public String selectRolePermissionByUserId(Long userId) {
        SysRole perms = roleMapper.selectRolePermissionByUserId(userId);
        return perms.getRoleKey();
    public SysRole selectRolePermissionByUserId(Long userId) {
        return roleMapper.selectRolePermissionByUserId(userId);
    }

    /**