From 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 04 七月 2025 20:39:12 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtStaffSuggestPageDto.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtStaffSuggestPageDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtStaffSuggestPageDto.java index 1474b8f..48ac3d2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtStaffSuggestPageDto.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtStaffSuggestPageDto.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * @author jqs34 * @version 1.0 @@ -24,10 +22,10 @@ private Long deptId; @ApiModelProperty(value = "提交开始时间") - private Date createStartTime; + private String createStartTime; @ApiModelProperty(value = "提交结束时间") - private Date createEndTime; + private String createEndTime; @ApiModelProperty(value = "建议状态0未回复1已回复") private Integer suggestStatus; @@ -36,9 +34,12 @@ private String tags; @ApiModelProperty(value = "回复开始时间") - private Date replayStartTime; + private String replayStartTime; @ApiModelProperty(value = "回复结束时间") - private Date replayEndTime; + private String replayEndTime; + + @ApiModelProperty(value = "建议排序1回复时间正序2回复时间倒序") + private Integer suggestSort; } -- Gitblit v1.7.1