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

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

@@ -277,7 +277,7 @@ public class EmployeeInfo {
 		this.isProbationPeriod = isProbationPeriod;
 	}
 
-	public boolean getIsProbationPeriod() {
+	public Boolean getIsProbationPeriod() {
 		return this.isProbationPeriod;
 	}