Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue

RuoYi

2020-06-07 2fd3cbbd18fed5e83911bbc7ec626e488dc79f00

 ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml

@@ -47,7 +47,8 @@
         and date_format(r.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')

      </if>

      <!-- 数据范围过滤 -->

      ${dataScope}

      ${params.dataScope}

      order by r.role_sort

   </select>

    

   <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">