Merge branch 'teacher_income'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

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

@@ -2135,8 +2135,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 Teacher teacher = idTeacherMap.get(teacherSalary.getUserId());
 
                 BigDecimal oldSalary = null;
+                BigDecimal oldSubsidy = null;
                 if(Objects.nonNull(teacherSalary.getSettlementTime())){
                     oldSalary = teacherSalary.getActualSalary();
+                    oldSubsidy = teacherSalary.getSubsidy();
                 }
 
                 switch (courseSchedule.getGroupType()){
@@ -2154,7 +2156,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 TeacherIncomeDto teacherIncomeInfo = new TeacherIncomeDto();
                 BeanUtils.copyProperties(courseSchedule, teacherIncomeInfo);
                 teacherIncomeInfo.setExpectSalary(teacherSalary.getExpectSalary());
-                teacherIncomeInfo.setSubsidy(teacherSalary.getSubsidy());
+                teacherIncomeInfo.setSubsidy(Objects.nonNull(oldSalary)?oldSubsidy:teacherSalary.getSubsidy());
                 teacherIncomeInfo.setActualSalary(Objects.nonNull(oldSalary)?oldSalary:teacherSalary.getActualSalary());
                 //如果是已结算课程，则需要处理扣减原因
                 if(Objects.nonNull(oldSalary)){