Merge remote-tracking branch 'origin/feature/0529-live' into feature/0529-live

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

@@ -205,7 +205,8 @@
             cssp.be_merged_,
             st.current_grade_num_,
             st.current_class_,
-            IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_
+            IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_,
+        cssp.join_course_type_ as joinCourseType
         FROM
             course_schedule_student_payment cssp
             LEFT JOIN sys_user su ON cssp.user_id_ = su.id_

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

@@ -193,6 +193,7 @@
         <result property="avatar" column="avatar_"/>
         <result property="phone" column="phone_"/>
         <result property="beMerged" column="be_merged_"/>
+        <result property="joinCourseType" column="joinCourseType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="status" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>