From e497a05ce312d26864b0c23cad97da9eb32c2cc1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 16:01:34 +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 | 7 ++++++-
1 files changed, 6 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..0e29a3d 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
@@ -12,6 +12,7 @@
public class QueryJhyOrderListVo {
private Long id;
+ private Long userId;
@ApiModelProperty(value="订单号")
private String orderNo;
@ApiModelProperty(value="联系人")
@@ -24,6 +25,10 @@
private String area;
@ApiModelProperty(value="详细地址")
private String address;
+ @ApiModelProperty(value="单元栋")
+ private String unitName;
+ @ApiModelProperty(value="楼门牌号")
+ private String houseNumber;
@ApiModelProperty(value="预约年月日")
private String reserveDate;
@ApiModelProperty(value="预约时间")
@@ -39,7 +44,7 @@
@ApiModelProperty(value="备注")
private String remark;
- @ApiModelProperty(value="备注")
+ @ApiModelProperty(value="回收类型")
private List<JhyOrderItemsVo> jhyOrderItemsVos;
}
--
Gitblit v1.9.1