From bca1629b96a41a4f669663eda6a881a6eca403ff Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 08 Jul 2021 16:14:31 +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 | 6 ++++++
1 files changed, 6 insertions(+), 0 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 db16d16..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
@@ -5,6 +5,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
@Data
@ApiModel(value = "QueryJhyOrderListVo", description = "返回")
@@ -17,6 +18,8 @@
private String name;
@ApiModelProperty(value="手机号")
private String mobilePhone;
+ @ApiModelProperty(value="集物员手机号")
+ private String jhyMobilePhone;
@ApiModelProperty(value="区域地址")
private String area;
@ApiModelProperty(value="详细地址")
@@ -36,4 +39,7 @@
@ApiModelProperty(value="备注")
private String remark;
+ @ApiModelProperty(value="回收类型")
+ private List<JhyOrderItemsVo> jhyOrderItemsVos;
+
}
--
Gitblit v1.9.1