Merge branch 'online1'

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

@@ -5868,7 +5868,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if (CourseSchedule.CourseScheduleType.HIGH_ONLINE.equals(courseMergeInfo.getType()) || CourseSchedule.CourseScheduleType.HIGH.equals(courseMergeInfo.getType())) {
 			List<CourseScheduleTeacherSalary> oldCourseSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedule(courseMergeInfo.getId());
 			for (CourseScheduleTeacherSalary oldCourseSalary : oldCourseSalaries) {
-				oldCourseSalary.setId(null);
 				//课酬调整后不能更新课酬
 				if(!oldCourseSalary.getEnableChangeSalary()){
 					continue;