Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1888,8 +1888,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							if (newCourseSchedule.getTeachMode() == TeachModeEnum.OFFLINE) {
 								ts.setExpectSalary(tdvs.getOfflineClassesSalary());
 							} else {
-								ts.setExpectSalary(tdvs.getOfflineClassesSalary());
+								ts.setExpectSalary(tdvs.getOnlineClassesSalary());
 							}
+						} else {
+							ts.setExpectSalary(new BigDecimal(0));
 						}
 					} else if (newCourseSchedule.getGroupType() == GroupType.PRACTICE) {
 						List<TeacherDefaultPracticeGroupSalary> teacherDefaultPracticeGroupSalaryList = teacherDefaultPracticeGroupSalaryDao