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

liding

5 天以前 1284fb157043e488aa1794d8f1b64ebf18aa5147

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

@@ -52,7 +52,7 @@
     * @return 角色数据集合信息

     */

    @Override

    @DataScope(deptAlias = "d")

    @DataScope(tenantIdFelid = "r")

    public List<SysRole> selectRoleList(SysRole role)

    {

        return roleMapper.selectRoleList(role);