From ccf8413a33e85589d0ed219bd1a0aff88e6a1e39 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Dec 2021 14:48:58 +0800
Subject: [PATCH] Merge branch 'score-shop' into xc-prd
---
gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
index c3dde64..452df57 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
@Data
@ApiModel(value = "JhyOrderListVo", description = "集物员订单列表返回参数类")
public class JhyOrderListVo {
@@ -26,6 +28,12 @@
@ApiModelProperty(value = "地址")
private String address;
+ @ApiModelProperty(value = "单元栋")
+ private String unitName;
+
+ @ApiModelProperty(value = "门牌号")
+ private String houseNumber;
+
@ApiModelProperty(value = "经度")
private String longitude;
@@ -34,6 +42,9 @@
@ApiModelProperty(value = "重量")
private String weight;
+
+ @ApiModelProperty(value = "取货时间")
+ private String receivingTime;
@ApiModelProperty(value = "备注")
private String remark;
@@ -55,4 +66,19 @@
@ApiModelProperty(value = "损耗重量")
private int lossWeight;
+
+ @ApiModelProperty(value = "状态")
+ private Integer status;
+
+ @ApiModelProperty(value = "集物员姓名")
+ private String jhyName;
+
+ @ApiModelProperty(value = "集物员电话")
+ private String jhyPhone;
+
+ @ApiModelProperty(value = "回收/台")
+ private String recycleTai;
+
+ @ApiModelProperty(value = "回收/kg")
+ private String recycleKg;
}
\ No newline at end of file
--
Gitblit v1.9.1