Merge branch 'f-6.6.7' into release

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/CommuneAdmBean.java

+package com.ctrip.fun.common.vo.user;
+
+import java.util.Date;
+
+
+/**
+ * 公社会员绑定会服表
+ * 
+ * @author gaoc
+ * 
+ */
+public class CommuneAdmBean implements java.io.Serializable {
+
+
+	private static final long serialVersionUID = -9147669998915817084L;
+
+	//CommuneAdm 表主键
+    private Integer id;
+    //社员uid
+    private String uid;
+    //vipGrade 
+    private Integer communeExtId;
+    //社员预留手机号码
+    private String mobilePhone;
+    //社员姓名
+    private String userName;
+    //社员生日
+    private Date birthday;
+    //vipGrade 
+    private Integer vipGrade;
+    //社员到期时间
+    private Date communeAgainTime;
+    //绑定的后台管理员姓名
+    private String bindedAdm;
+    //绑定时间
+    private Date bindTime;
+    //开单人
+    private String drawer;
+    //开单人
+    private String labels;
+    
+    
+    
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getUid() {
+		return uid;
+	}
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+	public String getMobilePhone() {
+		return mobilePhone;
+	}
+	public void setMobilePhone(String mobilePhone) {
+		this.mobilePhone = mobilePhone;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public Date getBirthday() {
+		return birthday;
+	}
+	public void setBirthday(Date birthday) {
+		this.birthday = birthday;
+	}
+	public Integer getVipGrade() {
+		return vipGrade;
+	}
+	public void setVipGrade(Integer vipGrade) {
+		this.vipGrade = vipGrade;
+	}
+	public Date getCommuneAgainTime() {
+		return communeAgainTime;
+	}
+	public void setCommuneAgainTime(Date communeAgainTime) {
+		this.communeAgainTime = communeAgainTime;
+	}
+	public String getBindedAdm() {
+		return bindedAdm;
+	}
+	public void setBindedAdm(String bindedAdm) {
+		this.bindedAdm = bindedAdm;
+	}
+	public Date getBindTime() {
+		return bindTime;
+	}
+	public void setBindTime(Date bindTime) {
+		this.bindTime = bindTime;
+	}
+	public Integer getCommuneExtId() {
+		return communeExtId;
+	}
+	public void setCommuneExtId(Integer communeExtId) {
+		this.communeExtId = communeExtId;
+	}
+	public String getDrawer() {
+		return drawer;
+	}
+	public void setDrawer(String drawer) {
+		this.drawer = drawer;
+	}
+	public String getLabels() {
+		return labels;
+	}
+	public void setLabels(String labels) {
+		this.labels = labels;
+	}
+    
+    
+
+	
+
+
+	
+}

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/CommuneAdmQuery.java

+package com.ctrip.fun.common.vo.user;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.ctrip.fun.common.vo.AbstractPagedQuery;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+
+
+/**
+ * 公社会员绑定会员表
+ * 
+ * @author gaoc
+ * 
+ */
+public class CommuneAdmQuery extends AbstractPagedQuery<CommuneAdmQuery> {
+
+	private static final long serialVersionUID = 3453917518924218900L;
+	
+	private String uid;
+	private String mobilePhone;
+	private String userName;
+	private Date  communeAgainTimeStart;
+	private Date  communeAgainTimeEnd;
+	private String bindedAdm;
+	private String drawer;
+	private String labels;
+	private Integer communeExtId;
+	
+	
+	public String getUid() {
+		return uid;
+	}
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+	public String getMobilePhone() {
+		return mobilePhone;
+	}
+	public void setMobilePhone(String mobilePhone) {
+		this.mobilePhone = mobilePhone;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	public Date getCommuneAgainTimeStart() {
+		return communeAgainTimeStart;
+	}
+	public void setCommuneAgainTimeStart(Date communeAgainTimeStart) {
+		this.communeAgainTimeStart = communeAgainTimeStart;
+	}
+	
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	public Date getCommuneAgainTimeEnd() {
+		return communeAgainTimeEnd;
+	}
+	public void setCommuneAgainTimeEnd(Date communeAgainTimeEnd) {
+		this.communeAgainTimeEnd = communeAgainTimeEnd;
+	}
+	public String getBindedAdm() {
+		return bindedAdm;
+	}
+	public void setBindedAdm(String bindedAdm) {
+		this.bindedAdm = bindedAdm;
+	}
+	public String getDrawer() {
+		return drawer;
+	}
+	public void setDrawer(String drawer) {
+		this.drawer = drawer;
+	}
+	public String getLabels() {
+		return labels;
+	}
+	public void setLabels(String labels) {
+		this.labels = labels;
+	}
+	public Integer getCommuneExtId() {
+		return communeExtId;
+	}
+	public void setCommuneExtId(Integer communeExtId) {
+		this.communeExtId = communeExtId;
+	}
+	
+	
+	
+}

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/CommuneExtBean.java

@@ -144,6 +144,8 @@ public class CommuneExtBean implements java.io.Serializable {
     private Integer communeYears;
     /**续费者*/
     private String renewer;
+    /**标签*/
+    private String labels;
 
 
     public Integer getId() {
@@ -427,4 +429,12 @@ public class CommuneExtBean implements java.io.Serializable {
 		this.renewer = renewer;
 	}
 
+	public String getLabels() {
+		return labels;
+	}
+
+	public void setLabels(String labels) {
+		this.labels = labels;
+	}
+
 }

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/CommuneLabelBean.java

+package com.ctrip.fun.common.vo.user;
+
+import java.util.Date;
+
+
+/**
+ * 公社会员绑定会服表
+ * 
+ * @author gaoc
+ * 
+ */
+public class CommuneLabelBean implements java.io.Serializable {
+
+
+	private static final long serialVersionUID = -9147669998915817084L;
+
+	//CommuneAdm 表主键
+    private Integer id;
+   
+    
+
+	private String labelName;
+
+
+
+	public Integer getId() {
+		return id;
+	}
+
+
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+
+
+	public String getLabelName() {
+		return labelName;
+	}
+
+
+
+	public void setLabelName(String labelName) {
+		this.labelName = labelName;
+	}
+
+	
+
+
+	
+}