fix:1、课程冲突忽略被合并课程

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

@@ -1736,6 +1736,7 @@
         </foreach>
         )
         AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
+        AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
     </select>
 
     <select id="findByClassDateWithoutMusicGroup" resultMap="CourseSchedule">