From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerOrderPageDto.java | 13 +++++++++++++
1 files changed, 13 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..d608eec 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.已核销")
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