Merge remote-tracking branch 'origin/master'

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

@@ -395,7 +395,7 @@
             s.teacher_id_,
             cs.group_type_,
             cs.teach_mode_,
-            IF(CONCAT( cs.class_date_, ' ', cs.end_class_time_ )<NOW() AND sa.status_!='NORMAL', NULL, cs.class_date_) course_start_time_
+            IF(CONCAT( cs.class_date_, ' ', cs.end_class_time_ )<NOW() AND (sa.status_ != 'NORMAL' OR sa.status_ IS NULL), NULL, cs.class_date_) course_start_time_
         FROM
             student s
             LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = s.user_id_