From 910ca2f0f8594a1353f822d653c88a7924902217 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 19:32:18 +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 | 27 ++++++++++++++++++++++++---
1 files changed, 24 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..6b0b83f 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
@@ -15,7 +15,7 @@
private String reserveTime;
@ApiModelProperty(value = "姓名")
- private String name;
+ private String username;
@ApiModelProperty(value = "手机号")
private String phone;
@@ -27,14 +27,35 @@
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 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;
}
\ No newline at end of file
--
Gitblit v1.9.1