From ccf8413a33e85589d0ed219bd1a0aff88e6a1e39 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Dec 2021 14:48:58 +0800
Subject: [PATCH] Merge branch 'score-shop' into xc-prd
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java | 4 ++++
1 files changed, 4 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..a4161b7 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,10 +26,14 @@
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="物流公司")
private String expressCom;
@ApiModelProperty(value="物流单号")
private String expressNo;
+ @ApiModelProperty(value="收货地址")
+ private String expressAddress;
}
--
Gitblit v1.9.1