From 280c1bf9b93fb57b65d2c3f88cc4924aa9d780b4 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 02 Jul 2021 10:39:56 +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 | 5 +++++ 1 files changed, 5 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..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 { @@ -35,6 +37,9 @@ @ApiModelProperty(value = "重量") private String weight; + @ApiModelProperty(value = "取货时间") + private String receivingTime; + @ApiModelProperty(value = "备注") private String remark; -- Gitblit v1.9.1