From 0561b12e8c5570a0f7e812543cc3460f80fee416 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Nov 2021 10:29:28 +0800
Subject: [PATCH] 20211108

---
 gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
index b86fffa..a4161b7 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
@@ -1,8 +1,11 @@
 package com.xzx.gc.shop.vo;
 
+import com.xzx.gc.entity.ScoreOrderDetails;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.List;
 
 @Data
 @ApiModel(value = "QueryOrderListVo", description = "返回")
@@ -18,15 +21,19 @@
     @ApiModelProperty(value="下单时间")
     private String createTime;
     @ApiModelProperty(value="订单详情")
-    private String orderDetails;
+    private List<ScoreOrderDetails> orderDetails;
     @ApiModelProperty(value="订单总价")
     private String totalPrice;
     @ApiModelProperty(value="数量")
     private String cnt;
+    @ApiModelProperty(value="后台确认提货  1:是  2:否")
+    private Integer isFinish;
     @ApiModelProperty(value="状态 2-待收货3-已完成4-已取消")
     private String status;
     @ApiModelProperty(value="物流公司")
     private String expressCom;
     @ApiModelProperty(value="物流单号")
     private String expressNo;
+    @ApiModelProperty(value="收货地址")
+    private String expressAddress;
 }

--
Gitblit v1.9.1