Merge branch 'online1'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleTeacherSalary.java

@@ -35,7 +35,7 @@ public class CourseScheduleTeacherSalary {
 	private String userName;
 	
 	/** 预计薪水 */
-	private java.math.BigDecimal expectSalary = BigDecimal.ZERO;
+	private java.math.BigDecimal expectSalary;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -44,13 +44,13 @@ public class CourseScheduleTeacherSalary {
 	private java.util.Date updateTime;
 	
 	/** 补贴 */
-	private java.math.BigDecimal subsidy = BigDecimal.ZERO;
+	private java.math.BigDecimal subsidy;
 	
 	/** 实际薪水 */
-	private java.math.BigDecimal actualSalary = BigDecimal.ZERO;
+	private java.math.BigDecimal actualSalary;
 
 	/** 课酬结算时计算的课酬 */
-	private java.math.BigDecimal teacherActualSalary = BigDecimal.ZERO;
+	private java.math.BigDecimal teacherActualSalary;
 	
 	/** 结算时间 */
 	private java.util.Date settlementTime;
@@ -59,7 +59,7 @@ public class CourseScheduleTeacherSalary {
 	
 	private CourseSchedule courseSchedule = new CourseSchedule();
 
-	private BigDecimal reduceSalary = BigDecimal.ZERO;
+	private BigDecimal reduceSalary;
 
 	private TeacherSalaryConfirmStatus confirmStatus;