From d1066456e89935d00ade5beb757ce667da9c468c Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Wed, 2 Jul 2025 15:17:14 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 47f74ac8 --- .../org/dromara/demo/domain/PmDataManagementInfo.java | 5 ----- .../dromara/demo/domain/bo/PmDataManagementInfoBo.java | 8 ++++---- .../dromara/demo/domain/vo/PmDataManagementInfoVo.java | 8 ++++---- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PmDataManagementInfo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PmDataManagementInfo.java index f0a1d38..cc68a56 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PmDataManagementInfo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PmDataManagementInfo.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; @@ -48,15 +47,11 @@ public class PmDataManagementInfo extends TenantEntity { /** * 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startDate; /** * 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endDate; /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PmDataManagementInfoBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PmDataManagementInfoBo.java index 9c81c2a..72c227e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PmDataManagementInfoBo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PmDataManagementInfoBo.java @@ -51,16 +51,16 @@ public class PmDataManagementInfoBo extends BaseEntity { * 开始时间 */ //@NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startDate; /** * 结束时间 */ //@NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endDate; /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PmDataManagementInfoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PmDataManagementInfoVo.java index 28cd675..b117774 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PmDataManagementInfoVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PmDataManagementInfoVo.java @@ -60,16 +60,16 @@ public class PmDataManagementInfoVo implements Serializable { * 开始时间 */ @ExcelProperty(value = "开始时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startDate; /** * 结束时间 */ @ExcelProperty(value = "结束时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endDate; /**