update

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

@@ -1,191 +1,250 @@
 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;
+
 	/** 性别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推送失败
+	@XStreamOmitField
+	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;
 	}
-	
+
 	public Integer getId(){
 		return this.id;
 	}
-			
+
 	public void setName(String name){
 		this.name = name;
 	}
-	
+
 	public String getName(){
 		return this.name;
 	}
-			
+
 	public void setSex(Integer sex){
 		this.sex = sex;
 	}
-	
+
 	public Integer getSex(){
 		return this.sex;
 	}
-			
+
 	public void setBirthday(java.util.Date birthday){
 		this.birthday = birthday;
 	}
-	
+
 	public java.util.Date getBirthday(){
 		return this.birthday;
 	}
-			
+
 	public void setCity(String city){
 		this.city = city;
 	}
-	
+
 	public String getCity(){
 		return this.city;
 	}
-			
+
 	public void setSchool(String school){
 		this.school = school;
 	}
-	
+
 	public String getSchool(){
 		return this.school;
 	}
-			
+
 	public void setGrade(String grade){
 		this.grade = grade;
 	}
-	
+
 	public String getGrade(){
 		return this.grade;
 	}
-			
+
 	public void setGClass(String gClass){
 		this.gClass = gClass;
 	}
-	
+
 	public String getGClass(){
 		return this.gClass;
 	}
-			
+
 	public void setSubId(Integer subId){
 		this.subId = subId;
 	}
-	
+
 	public Integer getSubId(){
 		return this.subId;
 	}
-			
+
 	public void setIsAdjust(Integer isAdjust){
 		this.isAdjust = isAdjust;
 	}
-	
+
 	public Integer getIsAdjust(){
 		return this.isAdjust;
 	}
-			
+
 	public void setPatriarchPhone(String patriarchPhone){
 		this.patriarchPhone = patriarchPhone;
 	}
-	
+
 	public String getPatriarchPhone(){
 		return this.patriarchPhone;
 	}
-			
+
 	public void setPatriarchName(String patriarchName){
 		this.patriarchName = patriarchName;
 	}
-	
+
 	public String getPatriarchName(){
 		return this.patriarchName;
 	}
-			
+
 	public void setPatriarchUnit(String patriarchUnit){
 		this.patriarchUnit = patriarchUnit;
 	}
-	
+
 	public String getPatriarchUnit(){
 		return this.patriarchUnit;
 	}
-			
+
 	public void setStatus(Integer status){
 		this.status = status;
 	}
-	
+
 	public Integer getStatus(){
 		return this.status;
 	}
-			
+
 	public void setUpdateTime(java.util.Date updateTime){
 		this.updateTime = updateTime;
 	}
-	
+
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}
-	
+
 	public java.util.Date getCreateTime(){
 		return this.createTime;
 	}
-			
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);