置换卷

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftQuery.java

@@ -9,7 +9,7 @@ public class VoucherGiftQuery extends AbstractPagedQuery{
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -5874854787742050433L;
+	private static final long serialVersionUID = 5874854787742050433L;
 
 	private Integer id;
 	

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftVo.java

@@ -7,7 +7,7 @@ public class VoucherGiftVo implements Serializable{
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 2577358588222153067L;
 
 	/**
 	 * 主键

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/AbstractOrderListItemBean.java

@@ -40,7 +40,8 @@ public class AbstractOrderListItemBean {
     private String teeTime;
     private Integer isConfirm;
     private BigDecimal PrePayAmount;
-  
+    private Integer orderCategory;
+    
 	public Integer getOrderType() {
         return orderType;
     }
@@ -226,5 +227,13 @@ public class AbstractOrderListItemBean {
 		PrePayAmount = prePayAmount;
 	}
 
+	public Integer getOrderCategory() {
+		return orderCategory;
+	}
+
+	public void setOrderCategory(Integer orderCategory) {
+		this.orderCategory = orderCategory;
+	}
+
 
 }

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

@@ -316,6 +316,10 @@ public class UserBean implements Serializable {
      */
     private Integer userWorkerId;
 
+    /**
+     * 是否是销售 1 是 0 不是
+     */
+    private Integer isSales;
     
     public Integer getUserWorkerId() {
 		return userWorkerId;
@@ -927,4 +931,12 @@ public class UserBean implements Serializable {
 		this.hobby = hobby;
 	}
 
+	public Integer getIsSales() {
+		return isSales;
+	}
+
+	public void setIsSales(Integer isSales) {
+		this.isSales = isSales;
+	}
+
 }