Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-common into f-6.7.0

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

@@ -111,14 +111,14 @@ public class CommuneAdmBean implements java.io.Serializable {
 	public void setCommuneAgainTime(Date communeAgainTime) {
 	public void setCommuneAgainTime(Date communeAgainTime) {
 		this.communeAgainTime = communeAgainTime;
 		this.communeAgainTime = communeAgainTime;
 	}
 	}
-	@ExcelTitleName(value = "绑定会服", number = 18)
+	@ExcelTitleName(value = "绑定销售", number = 18)
 	public String getBindedAdm() {
 	public String getBindedAdm() {
 		return bindedAdm;
 		return bindedAdm;
 	}
 	}
 	public void setBindedAdm(String bindedAdm) {
 	public void setBindedAdm(String bindedAdm) {
 		this.bindedAdm = bindedAdm;
 		this.bindedAdm = bindedAdm;
 	}
 	}
-	@ExcelTitleName(value = "绑定时间", number = 19)
+	@ExcelTitleName(value = "销售绑定时间", number = 19)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	public Date getBindTime() {
 	public Date getBindTime() {
@@ -128,14 +128,14 @@ public class CommuneAdmBean implements java.io.Serializable {
 		this.bindTime = bindTime;
 		this.bindTime = bindTime;
 	}
 	}
 
 
-	@ExcelTitleName(value = "绑定会服2", number = 18)
+	@ExcelTitleName(value = "绑定会服", number = 18)
 	public String getBindedAdm2() {
 	public String getBindedAdm2() {
 		return bindedAdm2;
 		return bindedAdm2;
 	}
 	}
 	public void setBindedAdm2(String bindedAdm2) {
 	public void setBindedAdm2(String bindedAdm2) {
 		this.bindedAdm2 = bindedAdm2;
 		this.bindedAdm2 = bindedAdm2;
 	}
 	}
-	@ExcelTitleName(value = "绑定时间2", number = 19)
+	@ExcelTitleName(value = "会服绑定时间", number = 19)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	public Date getBindTime2() {
 	public Date getBindTime2() {