From 985e48474a3decdcab3d5d99dc0b5211b381c2a6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 09:19:45 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtMemberSuggestPageDto.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtMemberSuggestPageDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtMemberSuggestPageDto.java
index 955b091..941fae9 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtMemberSuggestPageDto.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtMemberSuggestPageDto.java
@@ -4,8 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
-
/**
* @ClassName MgtMemberSuggestPageDto
* @Description TODO
@@ -20,10 +18,10 @@
private String keyword;
@ApiModelProperty(value = "提交开始时间")
- private Date createStartTime;
+ private String createStartTime;
@ApiModelProperty(value = "提交结束时间")
- private Date createEndTime;
+ private String createEndTime;
@ApiModelProperty(value = "建议状态0未回复1已回复")
private Integer suggestStatus;
@@ -35,16 +33,16 @@
private String tags;
@ApiModelProperty(value = "商户回复开始时间")
- private Date shopReplayStartTime;
+ private String shopReplayStartTime;
@ApiModelProperty(value = "商户回复结束时间")
- private Date shopReplayEndTime;
+ private String shopReplayEndTime;
@ApiModelProperty(value = "平台回复开始时间")
- private Date replayStartTime;
+ private String replayStartTime;
@ApiModelProperty(value = "平台回复结束时间")
- private Date replayEndTime;
+ private String replayEndTime;
@ApiModelProperty(value = "建议类型1平台2商户")
private Integer suggestType;
@@ -60,4 +58,7 @@
@ApiModelProperty(value = "商户id集合",hidden = true)
private String shopIds;
+
+ @ApiModelProperty(value = "建议类型1平台响应正序2平台响应倒序3商户响应正序4商户响应倒序")
+ private Integer suggestSort;
}
--
Gitblit v1.7.1