Merge branch 'feature/xgh/11月零散迭代' into 'developer'

自提截止时间

See merge request !2287

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderDetailVO.java

@@ -128,6 +128,11 @@ public class OrderDetailVO implements Serializable {
      * 自提时间
      */
     private Date pickUpTime;
+
+    /**
+     * 自提截止时间
+     */
+    private Date pickUpOverTime ;
     
     // 核销码
     private String writeOffCode ;
@@ -139,7 +144,15 @@ public class OrderDetailVO implements Serializable {
     
     // 物流包裹列表
     private List<String> orderLogisticsIdList ;
-    
+
+    public Date getPickUpOverTime() {
+        return pickUpOverTime;
+    }
+
+    public void setPickUpOverTime(Date pickUpOverTime) {
+        this.pickUpOverTime = pickUpOverTime;
+    }
+
     public Integer getUsePoint() {
         return usePoint;
     }