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

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/product/AsmCourseresourceBean.java

@@ -79,6 +79,7 @@ public class AsmCourseresourceBean implements java.io.Serializable {
      * 返现金额
      */
     private double cashRebate;
+    private double vipSaveAmount;
 
     // V5.3.2添加
 
@@ -570,5 +571,11 @@ public class AsmCourseresourceBean implements java.io.Serializable {
     public void setRealTimeTeeTimeType(Integer realTimeTeeTimeType) {
         this.realTimeTeeTimeType = realTimeTeeTimeType;
     }
+	public double getVipSaveAmount() {
+		return vipSaveAmount;
+	}
+	public void setVipSaveAmount(double vipSaveAmount) {
+		this.vipSaveAmount = vipSaveAmount;
+	}
 
 }

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/product/ResourcePriceBean.java

@@ -125,8 +125,6 @@ public class ResourcePriceBean implements Serializable {
     
     private String updateUser;
     
-    private double vipPrice;
-    
 
     public Integer getId() {
         return id;
@@ -376,14 +374,6 @@ public class ResourcePriceBean implements Serializable {
 	public void setUpdateUser(String updateUser) {
 		this.updateUser = updateUser;
 	}
-
-	public double getVipPrice() {
-		return vipPrice;
-	}
-
-	public void setVipPrice(double vipPrice) {
-		this.vipPrice = vipPrice;
-	}
     
     
 }