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

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

@@ -81,6 +81,10 @@ public class CommuneResourceBean implements java.io.Serializable {
     private Double prepaidPrice;
     private Double prepaidPrice;
 
 
     private Integer size;
     private Integer size;
+    
+    private Integer totalSize;
+    private Integer totalUsed;
+    
 
 
     private Integer inventoryType;
     private Integer inventoryType;
 
 
@@ -364,7 +368,23 @@ public class CommuneResourceBean implements java.io.Serializable {
         this.size = size;
         this.size = size;
     }
     }
 
 
-    public Integer getInventoryType() {
+    public Integer getTotalSize() {
+		return totalSize;
+	}
+
+	public void setTotalSize(Integer totalSize) {
+		this.totalSize = totalSize;
+	}
+
+	public Integer getTotalUsed() {
+		return totalUsed;
+	}
+
+	public void setTotalUsed(Integer totalUsed) {
+		this.totalUsed = totalUsed;
+	}
+
+	public Integer getInventoryType() {
         return inventoryType;
         return inventoryType;
     }
     }
 
 

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

@@ -3,7 +3,10 @@ package com.ctrip.fun.common.vo.product;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import com.ctrip.fun.common.vo.AbstractPagedQuery;
 import com.ctrip.fun.common.vo.AbstractPagedQuery;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 
 public class CommuneResourceQuery extends AbstractPagedQuery<CommuneResourceQuery> {
 public class CommuneResourceQuery extends AbstractPagedQuery<CommuneResourceQuery> {
     private static final long serialVersionUID = 2376696742841286523L;
     private static final long serialVersionUID = 2376696742841286523L;
@@ -32,6 +35,8 @@ public class CommuneResourceQuery extends AbstractPagedQuery<CommuneResourceQuer
         this.lng = lng;
         this.lng = lng;
     }
     }
 
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     public Date getPriceDate() {
     public Date getPriceDate() {
         return priceDate;
         return priceDate;
     }
     }