feat：课程合并

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -5302,9 +5302,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			courseSchedule.setClassDate(courseMergeInfo.getClassDate());
 			courseSchedule.setStartClassTime(courseMergeInfo.getStartClassTime());
 			courseSchedule.setEndClassTime(courseMergeInfo.getEndClassTime());
-			courseSchedule.setActualTeacherId(courseMergeInfo.getActualTeacherId());
-			courseSchedule.setClassGroupId(courseMergeInfo.getClassGroupId());
-			courseSchedule.setSchoolId(courseMergeInfo.getSchoolId());
+//			courseSchedule.setActualTeacherId(courseMergeInfo.getActualTeacherId());
+//			courseSchedule.setClassGroupId(courseMergeInfo.getClassGroupId());
+//			courseSchedule.setSchoolId(courseMergeInfo.getSchoolId());
 
 			courseScheduleModifyLog.setCurrentCourseSchedule(JsonUtil.toJSONString(courseSchedule));
 			courseScheduleModifyLog.setOperatorId(courseMergeInfo.getOperatorId());