Merge remote-tracking branch 'origin/master'

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

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

@@ -39,9 +39,6 @@
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.keao.edu.user.entity.Agency">
 		UPDATE agency <set>
-		<if test="id != null">
-		id_ = #{id},
-		</if>
 		<if test="updateTime != null">
 		update_time_ = #{updateTime},
 		</if>
@@ -60,9 +57,6 @@
 		<if test="name != null">
 		name_ = #{name},
 		</if>
-		<if test="createTime != null">
-		create_time_ = #{createTime},
-		</if>
 		<if test="tenantId != null">
 			tenant_id_ = #{tenantId},
 		</if>

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

@@ -24,31 +24,7 @@
 		<result column="role_name_" property="roleName" />
 		<result column="del_flag_" property="delFlag" />
 		<result column="tenant_id_" property="tenantId" />
-		<association property="sysUser" javaType="com.keao.edu.auth.api.entity.SysUser">
-			<result column="id_" property="id"/>
-			<result column="username_" property="username"/>
-			<result column="real_name_" property="realName"/>
-			<result column="password_" property="password"/>
-			<result column="salt_" property="salt"/>
-			<result column="phone_" property="phone"/>
-			<result column="avatar_" property="avatar"/>
-			<result column="create_time_" property="createTime"/>
-			<result column="update_time_" property="updateTime"/>
-			<result column="lock_flag_" property="lockFlag"/>
-			<result column="del_flag_" property="delFlag"/>
-			<result column="wx_openid_" property="wxOpenid"/>
-			<result column="qq_openid_" property="qqOpenid"/>
-			<result column="user_type_" property="userType"/>
-			<result column="gender_" property="gender"/>
-			<result column="nation_" property="nation"/>
-			<result column="birthdate_" property="birthdate"/>
-			<result column="email_" property="email"/>
-			<result column="im_token_" property="imToken"/>
-			<result column="id_card_no_" property="idCardNo"/>
-			<result column="wechat_id_" property="wechatId"/>
-			<result column="is_super_admin_" property="isSuperAdmin"/>
-			<result column="tenant_id_" property="tenantId"/>
-		</association>
+		<association property="sysUser" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 	</resultMap>
 
     <!-- 根据主键查询一条记录 -->