Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -1727,10 +1727,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         if(Objects.isNull(courseScheduleTeacherSalary.getSubsidy())){
             courseScheduleTeacherSalary.setSubsidy(BigDecimal.ZERO);
         }
-        if(BigDecimal.ZERO.compareTo(courseScheduleTeacherSalary.getSubsidy()) != 0){
+/*        if(BigDecimal.ZERO.compareTo(courseScheduleTeacherSalary.getSubsidy()) != 0){
             expectSalary = expectSalary.add(courseScheduleTeacherSalary.getSubsidy());
             deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.SUBSIDY, courseScheduleTeacherSalary.getSubsidy()));
-        }
+        }*/
         if(BigDecimal.ZERO.compareTo(expectSalary) > 0){
             expectSalary = new BigDecimal(0);
         }
@@ -1822,10 +1822,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         if(Objects.isNull(courseScheduleTeacherSalary.getSubsidy())){
             courseScheduleTeacherSalary.setSubsidy(BigDecimal.ZERO);
         }
-        if(BigDecimal.ZERO.compareTo(courseScheduleTeacherSalary.getSubsidy()) != 0){
+/*        if(BigDecimal.ZERO.compareTo(courseScheduleTeacherSalary.getSubsidy()) != 0){
             expectSalary = expectSalary.add(courseScheduleTeacherSalary.getSubsidy());
             deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.SUBSIDY, courseScheduleTeacherSalary.getSubsidy()));
-        }
+        }*/
         if(BigDecimal.ZERO.compareTo(expectSalary) > 0){
             expectSalary = new BigDecimal(0);
         }