From 7836ee496905742408abb4a6ad9f1f2e27f2e70b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Jul 2021 10:45:52 +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 | 8 +++++++-
1 files changed, 7 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 feeb063..1a46f07 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,13 +1,17 @@
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 = "返回")
public class QueryOrderListVo {
+ private Long id;
@ApiModelProperty(value="订单编号")
private String orderNo;
@ApiModelProperty(value="客户姓名")
@@ -15,7 +19,9 @@
@ApiModelProperty(value="客户手机号")
private String phone;
@ApiModelProperty(value="下单时间")
- private String createdTime;
+ private String createTime;
+ @ApiModelProperty(value="订单详情")
+ private List<ScoreOrderDetails> orderDetails;
@ApiModelProperty(value="订单总价")
private String totalPrice;
@ApiModelProperty(value="数量")
--
Gitblit v1.9.1