From f3bf2c69494bb78afa098819b742677dd8be6b7c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 16:01:25 +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 | 6 +++++-
1 files changed, 5 insertions(+), 1 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..db16d16 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,11 +21,15 @@
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="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
+ @ApiModelProperty(value="总重")
+ private BigDecimal totalWeight;
+ @ApiModelProperty(value="状态 1-待接单2-已接单3-已收款(用户)/待入库(集物员)4-已完成5-已取消")
private Integer status;
@ApiModelProperty(value="集物员")
private String username;
--
Gitblit v1.9.1