From 02fe295ee1dc726717cc005de584d0ebd05d8e92 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 11 Jun 2021 10:02:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptht-publicSecurity

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/article/entity/Article.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/article/entity/Article.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/article/entity/Article.java
index f8531e0..cde1278 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/article/entity/Article.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/article/entity/Article.java
@@ -10,6 +10,7 @@
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * @author zhongrj
@@ -19,6 +20,8 @@
 @Data
 @TableName("sys_article")
 public class Article implements Serializable {
+
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 主键id,自增
@@ -53,13 +56,14 @@
 	 */
 	@TableField("create_time")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	private LocalDateTime createTime;
+	private Date createTime;
 
 	/**
 	 * 更新时间
 	 */
 	@TableField("update_time")
-	private LocalDateTime updateTime;
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	private Date updateTime;
 
 	/**
 	 * 发布来源id

--
Gitblit v1.9.3