From bb5a5bdc383f40d3338aa50cc921a74d79d0023b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Jul 2021 16:39:56 +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/QueryOrderListVo.java | 7 ++++++-
1 files changed, 6 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..bd49c0b 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,11 +21,13 @@
@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="物流公司")
--
Gitblit v1.9.1