fix:

修复登录bug
feat:
合并主分支基础代码

tr-modules/tr-module-system/src/main/resources/mapper/user/SysRoleMapper.xml

@@ -8,8 +8,8 @@
     <select id="findAllRoleByUserId" resultType="cn.tr.module.sys.user.po.SysRolePO">
          select r.*
             from (select * from sys_user where id=#{id}) as u
-            join sys_user_role  as ur on ur.user_id=u.id
-            join sys_role as r on r.id = ur.role_id
+            join sys_user_role  as sur on sur.user_id=u.id
+            join sys_role as r on r.id = sur.role_id
     </select>