From 07fb617c686699435cde29e8147f11a125d7d618 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 23 六月 2025 11:10:12 +0800
Subject: [PATCH] bug修改

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerOrderPageDto.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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..6e9df12 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
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author jqs34
  * @ClassName MerMemberNoClearOrderDto
@@ -19,10 +21,21 @@
     @ApiModelProperty(value = "会员用户id")
     private Long memberUserId;
 
+    @ApiModelProperty(value = "会员用户id",hidden = true)
+    private List<Long> memberUserIdList;
+
     @ApiModelProperty(value = "搜索关键词")
     private String keyword;
 
-    @ApiModelProperty(value = "1.全部2.待核销3.已核销")
+    @ApiModelProperty(value = "0.已取消1.全部2.待核销3.已核销")
     private Integer type;
 
+    @ApiModelProperty(value = "订单开始时间")
+    private String startOrderDate;
+
+    @ApiModelProperty(value = "订单结束时间")
+    private String endOrderDate;
+    
+    @ApiModelProperty(value = "订单来源1.商城2.秒杀活动3.线下创建4.抽奖5.美团6.抖音7.快手")
+    private Integer orderFrom;
 }

--
Gitblit v1.7.1