From 33d82cdff305ce4cb784638edc258b7bb8397353 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Jan 2021 15:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/Article.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/Article.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/Article.java
index 8619f5f..11d512f 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/Article.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/Article.java
@@ -1,5 +1,8 @@
 package com.matrix.system.hive.bean;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
+
 import java.util.Date;
 import java.io.Serializable;
 /**
@@ -65,6 +68,7 @@
 	/**
 	 * 创建时间
 	 */
+	@JsonFormat(pattern = DateUtil.DATE_FORMAT_SS, timezone = "GMT+8")
 	private Date  createtiem;
 			
 	

--
Gitblit v1.9.1