Merge remote-tracking branch 'origin/master'

吴羡

10 天以前 1c52e77d77d0e924a1df0725c0748afde172ad68

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

@@ -86,6 +86,12 @@
        return roles;
    }

    @Override
    public List<SysRole> selectAssignedRolesByUserId(Long userId)
    {
        return roleMapper.selectRolePermissionByUserId(userId);
    }

    /**
     * 根据用户ID查询权限
     *