Merge commit 'd952f604' into f-6.6.81

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

@@ -18,6 +18,7 @@ public abstract class AbstractRuleConditionBean<T extends AbstractRuleConditionB
     protected String resourceIds; // 资源ID
     protected String resourceIds; // 资源ID
     protected Date productStartDate; // 产品或资源ID的开始时间
     protected Date productStartDate; // 产品或资源ID的开始时间
     protected Date productEndDate;// 产品或资源的结束时间
     protected Date productEndDate;// 产品或资源的结束时间
+    protected Integer onlyMe; // onlyMe:0/1 是否只能本人使用
 
 
     public abstract boolean isEnableUse(T t);
     public abstract boolean isEnableUse(T t);
 
 
@@ -63,4 +64,12 @@ public abstract class AbstractRuleConditionBean<T extends AbstractRuleConditionB
         this.productEndDate = productEndDate;
         this.productEndDate = productEndDate;
     }
     }
 
 
+	public Integer getOnlyMe() {
+		return onlyMe;
+	}
+
+	public void setOnlyMe(Integer onlyMe) {
+		this.onlyMe = onlyMe;
+	}
+
 }
 }

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

@@ -14,6 +14,7 @@ public class MultipleCourseConditionBean {
 	protected Integer type; // 类型
 	protected Integer type; // 类型
     protected Date productStartDate; // 产品或资源ID的开始时间
     protected Date productStartDate; // 产品或资源ID的开始时间
     protected Date productEndDate;// 产品或资源的结束时间
     protected Date productEndDate;// 产品或资源的结束时间
+    protected Integer onlyMe; // onlyMe:0/1 是否只能本人使用
 
 
     
     
     /**
     /**
@@ -135,6 +136,14 @@ public class MultipleCourseConditionBean {
 	public void setConditionList(List<ConditionMultipleElement> conditionList) {
 	public void setConditionList(List<ConditionMultipleElement> conditionList) {
 		this.conditionList = conditionList;
 		this.conditionList = conditionList;
 	}
 	}
+
+	public Integer getOnlyMe() {
+		return onlyMe;
+	}
+
+	public void setOnlyMe(Integer onlyMe) {
+		this.onlyMe = onlyMe;
+	}
     
     
     
     
     
     

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

@@ -43,6 +43,7 @@ public class VoucherItemDTO implements Serializable {
     
     
     private int multiple;
     private int multiple;
     private String multiAmount;
     private String multiAmount;
+    private Integer onlyMe;//是否本人使用1是本人使用;0是非本人使用
 
 
     public void doExecuteNullField() {
     public void doExecuteNullField() {
         if (description == null) {
         if (description == null) {
@@ -259,4 +260,14 @@ public class VoucherItemDTO implements Serializable {
 		this.multiAmount = multiAmount;
 		this.multiAmount = multiAmount;
 	}
 	}
 
 
+
+	public Integer getOnlyMe() {
+		return onlyMe;
+	}
+
+
+	public void setOnlyMe(Integer onlyMe) {
+		this.onlyMe = onlyMe;
+	}
+
 }
 }

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

@@ -151,6 +151,11 @@ public class VoucherRuleBean implements java.io.Serializable {
      * 发放用户类型Msg
      * 发放用户类型Msg
      */
      */
     private String sendToUserValueMsg;
     private String sendToUserValueMsg;
+    
+    /**
+     * 是否仅限本人使用
+     */
+    private int onlyMe;//仅限本人使用：1是;0否   
 
 
     @SuppressWarnings("rawtypes")
     @SuppressWarnings("rawtypes")
     public AbstractRuleConditionBean getRuleCondition() {
     public AbstractRuleConditionBean getRuleCondition() {
@@ -389,4 +394,12 @@ public class VoucherRuleBean implements java.io.Serializable {
 		this.multiple = multiple;
 		this.multiple = multiple;
 	}
 	}
 
 
+	public int getOnlyMe() {
+		return onlyMe;
+	}
+
+	public void setOnlyMe(int onlyMe) {
+		this.onlyMe = onlyMe;
+	}
+
 }
 }