From c89dd113d8573a10a9e666785b8be5d4c3ef511d Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期一, 24 二月 2025 15:05:27 +0800
Subject: [PATCH] Merge branch 'develop1.0' into develop_alioo
---
zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBasePageVO.java | 6 +++++-
1 files changed, 5 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 0ef28d5..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
@@ -4,6 +4,9 @@
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
@@ -36,5 +39,6 @@
* 鍒涘缓鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String createTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
}
--
Gitblit v1.9.3