From cd56d5963f7234a03fec057d807ad1607be17c23 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 16:47:17 +0800
Subject: [PATCH] conflect
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java | 2 +-
1 files changed, 1 insertions(+), 1 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 c5f117e..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,7 +28,7 @@
private BigDecimal totalPrice;
@ApiModelProperty(value="凭证")
- private String voucherImg;
+ private List<String> voucherImgs;
/**
* 2-待收货3-已完成4-已取消
--
Gitblit v1.9.1