From 28f9605441cdda5bd9cfabd2241ff8509a4a8888 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 20 十月 2025 18:48:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/ContractTemplateType.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/ContractTemplateType.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/ContractTemplateType.java index db1dc63..6597019 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/ContractTemplateType.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/ContractTemplateType.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -38,6 +39,8 @@ @ApiModelProperty(value = "创建时间") @TableField("create_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime createTime; @ApiModelProperty(value = "创建人") @@ -46,6 +49,8 @@ @ApiModelProperty(value = "更新时间") @TableField("update_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime updateTime; @ApiModelProperty(value = "更新人") -- Gitblit v1.7.1