From f4ef9fccb3347fd364ca59575bf62fe5e4362f59 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Jul 2021 14:17:09 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java | 11 +++++++++++
1 files changed, 11 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 d63487c..af6ac72 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 {
@@ -35,6 +37,9 @@
@ApiModelProperty(value = "重量")
private String weight;
+ @ApiModelProperty(value = "取货时间")
+ private String receivingTime;
+
@ApiModelProperty(value = "备注")
private String remark;
@@ -64,4 +69,10 @@
@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