From cc52e21c310fc2dba49c24d7ed985b0aed1bb489 Mon Sep 17 00:00:00 2001 From: VVT789 <sdxt_0802@163.com> Date: 星期一, 17 二月 2025 23:26:55 +0800 Subject: [PATCH] Merge branch 'master' into wt_from_develop1.0 --- zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBasePageVO.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBasePageVO.java b/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBasePageVO.java index 22b923d..239a928 100644 --- a/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBasePageVO.java +++ b/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBasePageVO.java @@ -1,6 +1,12 @@ package com.zhitan.knowledgeBase.domain.vo; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * @Author DYL @@ -11,6 +17,7 @@ /** * id */ + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** * 鏍囬 @@ -31,5 +38,7 @@ /** * 鍒涘缓鏃堕棿 */ - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; } -- Gitblit v1.9.3