From 7a69fd5e4db1f01b95385e5757ccf73359d2fa3d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Jun 2021 17:19:54 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
index ffc5ad3..8259788 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
@@ -1,9 +1,39 @@
 package com.xzx.gc.shop.vo;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
 
 @Data
 @ApiModel(value = "QueryJhyOrderListVo", description = "返回")
 public class QueryJhyOrderListVo {
+
+    private Long id;
+    @ApiModelProperty(value="订单号")
+    private String orderNo;
+    @ApiModelProperty(value="联系人")
+    private String name;
+    @ApiModelProperty(value="手机号")
+    private String mobilePhone;
+    @ApiModelProperty(value="区域地址")
+    private String area;
+    @ApiModelProperty(value="详细地址")
+    private String address;
+    @ApiModelProperty(value="预约年月日")
+    private String reserveDate;
+    @ApiModelProperty(value="预约时间")
+    private String reserveTime;
+    @ApiModelProperty(value="订单总金额")
+    private BigDecimal totalPrice;
+    @ApiModelProperty(value="总重")
+    private BigDecimal totalWeight;
+    @ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
+    private Integer status;
+    @ApiModelProperty(value="集物员")
+    private String username;
+    @ApiModelProperty(value="备注")
+    private String remark;
+
 }

--
Gitblit v1.9.1