From 2723b71882f6b34d7c443019d1bb5674250c1893 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 01 Jul 2021 16:50:05 +0800
Subject: [PATCH] fix

---
 gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 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 0d9fdad..e78d6b7 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 {
@@ -15,7 +17,7 @@
     private String reserveTime;
 
     @ApiModelProperty(value = "姓名")
-    private String name;
+    private String username;
 
     @ApiModelProperty(value = "手机号")
     private String phone;
@@ -27,14 +29,44 @@
     private String address;
 
     @ApiModelProperty(value = "经度")
-    private String lon;
+    private String longitude;
 
     @ApiModelProperty(value = "纬度")
-    private String lat;
+    private String latitude;
 
     @ApiModelProperty(value = "重量")
     private String weight;
 
+    @ApiModelProperty(value = "取货时间")
+    private String receivingTime;
+
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "入库时间")
+    private String storageTime;
+
+    @ApiModelProperty(value = "入库重量")
+    private String storageWeight;
+
+    @ApiModelProperty(value = "入库积分")
+    private String storageScore;
+
+    @ApiModelProperty(value = "回收重量")
+    private String recycleWeight;
+
+    @ApiModelProperty(value = "回收积分")
+    private String recycleScore;
+
+    @ApiModelProperty(value = "损耗重量")
+    private int lossWeight;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "集物员姓名")
+    private String jhyName;
+
+    @ApiModelProperty(value = "集物员电话")
+    private String jhyPhone;
 }
\ No newline at end of file

--
Gitblit v1.9.1