From 0d80b4c564c858108059158c9d43cc419eacf1b7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Jun 2021 14:21:28 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
index ae1f281..8259788 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
@@ -21,10 +21,14 @@
     private String area;
     @ApiModelProperty(value="详细地址")
     private String address;
+    @ApiModelProperty(value="预约年月日")
+    private String reserveDate;
     @ApiModelProperty(value="预约时间")
     private String reserveTime;
     @ApiModelProperty(value="订单总金额")
     private BigDecimal totalPrice;
+    @ApiModelProperty(value="总重")
+    private BigDecimal totalWeight;
     @ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
     private Integer status;
     @ApiModelProperty(value="集物员")

--
Gitblit v1.9.1