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

# Conflicts:
#	src/main/java/com/ym/mec/collectfee/entity/ApplyInfo.java

src/main/java/com/ym/mec/collectfee/entity/ApplyInfo.java

@@ -1,119 +1,63 @@
 package com.ym.mec.collectfee.entity;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 对应数据库表(apply_info):
  */
-@XStreamAlias("user")
 public class ApplyInfo {
 
 	/**  */
-	@XStreamOmitField
 	private Integer id;
 	
-	/** 用户名 */
-	@XStreamAlias("userName")
-	private String name;
-
 	/** 学生姓名 */
-	private String realName;
-
-	//所属分部
-	private Integer branchId;
+	private String name;
 	
 	/** 性别0男1女 */
 	private Integer sex;
 	
 	/** 生日 */
 	@XStreamAlias("birthDay")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
 	private java.util.Date birthday;
 	
 	/** 城市 */
-	@XStreamOmitField
 	private String city;
 	
 	/** 学校编号 */
-	@XStreamOmitField
 	private String school;
 	
 	/** 年级 */
-	@XStreamOmitField
 	private String grade;
 	
 	/** 班级 */
-	@XStreamAlias("class")
 	private String gClass;
 	
 	/** 科目id */
-	@XStreamOmitField
 	private Integer subId;
 	
 	/** 是否服从调剂 0 否 1是 */
-	@XStreamOmitField
 	private Integer isAdjust;
 	
 	/** 家长手机号 */
-	@XStreamAlias("pMobile")
 	private String patriarchPhone;
 	
 	/** 家长姓名 */
-	@XStreamAlias("pName")
 	private String patriarchName;
 	
 	/** 家长工作单位 */
-	@XStreamAlias("pCompany")
 	private String patriarchUnit;
 	
 	/** 0报名中，1报名完成，2报名失败 */
-	@XStreamOmitField
 	private Integer status;
-
-	//推送状态 0未推送，1推送成功，2推送失败
-	private Integer pushStatus;
-
+	
 	/**  */
-	@XStreamOmitField
 	private java.util.Date updateTime;
 	
 	/**  */
-	@XStreamOmitField
 	private java.util.Date createTime;
-
-	public Integer getPushStatus() {
-		return pushStatus;
-	}
-
-	public void setPushStatus(Integer pushStatus) {
-		this.pushStatus = pushStatus;
-	}
-
-	public Integer getBranchId() {
-		return branchId;
-	}
-
-	public void setBranchId(Integer branchId) {
-		this.branchId = branchId;
-	}
-
-	public String getRealName() {
-		return realName;
-	}
-
-	public void setRealName(String realName) {
-		this.realName = realName;
-	}
-
-	public String getgClass() {
-		return gClass;
-	}
-
-	public void setgClass(String gClass) {
-		this.gClass = gClass;
-	}
-
+	
 	public void setId(Integer id){
 		this.id = id;
 	}