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/MgtMemberOrderTotalDto.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtMemberOrderTotalDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtMemberOrderTotalDto.java
index 06acb79..117a045 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtMemberOrderTotalDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtMemberOrderTotalDto.java
@@ -4,8 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
-
/**
* @author jqs34
* @ClassName MgtMemberOrderTotalDto
@@ -17,7 +15,7 @@
public class MgtMemberOrderTotalDto extends MgtBaseDto {
@ApiModelProperty(value = "用户id")
- private Long userId;
+ private Long memberUserId;
@ApiModelProperty(value = "搜索关键词")
private String keyword;
@@ -26,9 +24,9 @@
private Integer orderStatus;
@ApiModelProperty(value = "订单开始日期")
- private Date startOrderDate;
+ private String startOrderDate;
@ApiModelProperty(value = "订单结束日期")
- private Date endOrderDate;
+ private String endOrderDate;
}
--
Gitblit v1.7.1