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/ViewOrderVo.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java
index 076d0b7..a8555b2 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java
@@ -28,12 +28,12 @@
private BigDecimal totalPrice;
@ApiModelProperty(value="凭证")
- private String voucherImg;
+ private List<String> voucherImgs;
/**
* 2-待收货3-已完成4-已取消
*/
- @ApiModelProperty(value="状态 2-待收货3-已完成4-已取消")
+ @ApiModelProperty(value="状态 1-待发货2-待收货3-已收货4-已完成5-已评价6-已取消")
private Integer status;
@ApiModelProperty(value="备注")
--
Gitblit v1.9.1