From fe04c9455a441c202f6c4590a08f46e16bd34ce3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 22 Jul 2021 16:39:12 +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/QueryOrderListVo.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
index 1a46f07..bd49c0b 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
@@ -26,6 +26,8 @@
private String totalPrice;
@ApiModelProperty(value="数量")
private String cnt;
+ @ApiModelProperty(value="后台确认提货 1：是 2：否")
+ private Integer isFinish;
@ApiModelProperty(value="状态 2-待收货3-已完成4-已取消")
private String status;
@ApiModelProperty(value="物流公司")
--
Gitblit v1.9.1