Merge branch 'f-6.6.9' into f-6.7.0

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/adminUser/AdminUserQuery.java

-package com.ctrip.fun.common.vo.adminUser;
-import com.ctrip.fun.common.vo.AbstractPagedQuery;
-
-/**
- * Created by pat on 14-5-26.
- *
- * @author: l_cheng@ctrip.com
- * @date: 2014-05-26
- */
-public class AdminUserQuery extends AbstractPagedQuery {
-	private Integer id;
-	private String userName;
-	private String nickName;
-
-	
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getNickName() {
-		return nickName;
-	}
-
-	public void setNickName(String nickName) {
-		this.nickName = nickName;
-	}
-	
-}

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

+package com.ctrip.fun.common.vo.user;
+
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+
+public class ActiveCustomerBean {
+
+	
+	private Integer id ;
+
+	private String saleMobile;
+	private String customerName;
+	private String customerMobile;
+	private String picUrl;
+	private String sex;
+	private Date createTime;
+	private Date updateTime;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getSaleMobile() {
+		return saleMobile;
+	}
+	public void setSaleMobile(String saleMobile) {
+		this.saleMobile = saleMobile;
+	}
+	public String getCustomerName() {
+		return customerName;
+	}
+	public void setCustomerName(String customerName) {
+		this.customerName = customerName;
+	}
+	public String getCustomerMobile() {
+		return customerMobile;
+	}
+	public void setCustomerMobile(String customerMobile) {
+		this.customerMobile = customerMobile;
+	}
+	public String getPicUrl() {
+		return picUrl;
+	}
+	public void setPicUrl(String picUrl) {
+		this.picUrl = picUrl;
+	}
+	public String getSex() {
+		return sex;
+	}
+	public void setSex(String sex) {
+		this.sex = sex;
+	}
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	
+
+	
+}