From 297b4b60ca499969eeccc1a5113810fdc2034486 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Jul 2021 10:47:20 +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/QueryJhyOrderListVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
index 05d43d3..bb8660d 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
@@ -39,7 +39,7 @@
@ApiModelProperty(value="备注")
private String remark;
- @ApiModelProperty(value="备注")
+ @ApiModelProperty(value="回收类型")
private List<JhyOrderItemsVo> jhyOrderItemsVos;
}
--
Gitblit v1.9.1