Merge remote-tracking branch 'origin/master'

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

@@ -2355,8 +2355,14 @@
             left join teacher_attendance ta on ta.course_schedule_id_ = cs.id_
             LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_
             <include refid="endFindCourseSchedulesCondition"/>
-        GROUP BY cs.id_
-        ORDER BY course_start_time_,cs.id_
+        GROUP BY
+            cs.class_date_,
+            cs.start_class_time_,
+            cs.id_
+        ORDER BY
+            cs.class_date_,
+            cs.start_class_time_,
+            cs.id_
         <include refid="global.limit"/>
     </select>