Merge branch 'origin_master' of http://git.dayaedu.com/yonge/mec into origin_master

mec-biz/src/main/resources/config/mybatis/ImUserFriendMapper.xml

@@ -39,11 +39,12 @@
 		INSERT INTO im_user_friend (id_,user_id_,friend_id_,friend_nickname_,memo_,tags_,create_time_,update_time_)
 		VALUES(#{id},#{userId},#{friendId},#{friendNickname},#{memo},#{tags},#{createTime},#{updateTime})
 	</insert>
+
 	<insert id="batchInsert">
-		INSERT INTO im_user_friend (user_id_,friend_id_,friend_nickname_,create_time_,update_time_)
+		INSERT INTO im_user_friend (user_id_,friend_id_,friend_nickname_,memo_,tags_,create_time_,update_time_)
 		VALUES
 		<foreach collection="teachers" item="item" separator=",">
-			(#{teacherId},#{item.userId},#{item.name},NOW(),NOW())
+			(#{teacherId},#{item.userId},#{item.name},#{item.subjectName},#{item.musicGroupName},NOW(),NOW())
 		</foreach>
 	</insert>