From 48b69b857ae860050a790be63b317e15be49f1b1 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期二, 13 五月 2025 16:57:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerCapacitorHisDTO.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerCapacitorHisDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerCapacitorHisDTO.java index 70481fa..62e2b1d 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerCapacitorHisDTO.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerCapacitorHisDTO.java @@ -1,9 +1,11 @@ package com.iailab.module.ansteel.api.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @author PanZhibao @@ -30,6 +32,7 @@ @Schema(description = "备注") private String remark; - @Schema(description = "i创建时间d") - private String createDate; + @Schema(description = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createDate; } \ No newline at end of file -- Gitblit v1.9.3