Merge branch 'online1'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java
#	mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -53,6 +53,8 @@ public class CourseSchedule {
 	/**  */
 	private Long id;
 
+	private Long newCourseId;
+
 	private GroupType groupType;
 
 	/**  */

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

@@ -668,8 +668,14 @@
         GROUP BY mg.organ_id_
     </select>
 
+
+    <resultMap id="UserGroupDto" type="com.ym.mec.biz.dal.dto.UserGroupDto">
+        <result column="user_id_" property="userId"/>
+        <result column="group_id_" property="groupId"/>
+        <result column="group_name_" property="groupName"/>
+    </resultMap>
     <select id="getUserGroups" resultMap="UserGroupDto">
-        SELECT DISTINCT sr.user_id_, mg.name_ FROM student_registration sr
+        SELECT DISTINCT sr.user_id_, mg.id_ group_id_, mg.name_ group_name_ FROM student_registration sr
         LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
         WHERE sr.payment_status_=2 AND sr.user_id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">