Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.keao.edu.user.dao.StudentDao">
 	
-	<resultMap type="com.keao.edu.user.api.entity.Student" id="Student">
+	<resultMap type="com.keao.edu.user.api.entity.Student" id="Student" extends="com.keao.edu.user.dao.SysUserDao.SysUser">
 		<result column="user_id_" property="userId" />
 		<result column="certificate_photo_" property="certificatePhoto" />
 		<result column="create_time_" property="createTime" />

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" 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">