Merge remote-tracking branch 'origin/master'

# Conflicts:
#	edu-user/edu-user-server/src/main/resources/config/mybatis/SysUserMapper.xml

edu-user/edu-user-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -30,9 +30,7 @@
         <result column="wechat_id_" property="wechatId"/>
         <result column="is_super_admin_" property="isSuperAdmin"/>
         <result column="tenant_id_" property="tenantId"/>
-        <collection property="roles" column="role_id_" ofType="java.lang.Integer" >
-            <result column="role_id_"/>
-        </collection>
+        <collection property="roles" ofType="int" column="role_id_"/>
     </resultMap>
 
     <resultMap id="BaseUserInfoDto" type="com.keao.edu.user.dto.BaseUserInfoDto">