Merge remote-tracking branch 'origin/master'

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

@@ -162,7 +162,7 @@
         <result column="sign_in_status_" property="signInStatus"/>
         <result column="sign_out_status_" property="signOutStatus"/>
         <result column="remark_" property="remark"/>
-        <result column="id_" property="id"/>
+        <result column="id_" property="courseScheduleId"/>
         <result column="end_class_time_" property="endClassTime"/>
     </resultMap>