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/ViewJhyOrderVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
index 495c6df..360127a 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
@@ -54,6 +54,6 @@
@ApiModelProperty(value="是否匿名 1-是2-否")
private String isAnonymous;
- private List<JhyOrderItems> JhyOrderItems;
+ private List<JhyOrderItemsVo> JhyOrderItems;
}
--
Gitblit v1.9.1