From e755145ce3a5d14468a09b4062c84d7c13a92f0c Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 04 十一月 2024 15:39:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java index a124b72..b1023e7 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -11,6 +12,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -39,11 +41,13 @@ @ApiModelProperty(value = "开始时间") @TableField("start_time") - private LocalDateTime startTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private LocalDate startTime; @ApiModelProperty(value = "结束时间") @TableField("end_time") - private LocalDateTime endTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private LocalDate endTime; -- Gitblit v1.7.1