From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerOrderPageDto.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerOrderPageDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerOrderPageDto.java
index 2483ff1..4c94e4a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerOrderPageDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerOrderPageDto.java
@@ -25,4 +25,12 @@
     @ApiModelProperty(value = "1.全部2.待核销3.已核销")
     private Integer type;
 
+    @ApiModelProperty(value = "订单开始时间")
+    private String startOrderDate;
+
+    @ApiModelProperty(value = "订单结束时间")
+    private String endOrderDate;
+
+    @ApiModelProperty(value = "订单来源1.店铺商品2.平台秒杀活动3.线下创建")
+    private Integer orderFrom;
 }

--
Gitblit v1.7.1