From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole
---
src/main/java/com/xcong/excoin/modules/documentary/vo/FollowFollowerNoticeVo.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowFollowerNoticeVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowFollowerNoticeVo.java
index 042a3bf..be91a08 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowFollowerNoticeVo.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowFollowerNoticeVo.java
@@ -2,6 +2,8 @@
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,6 +12,7 @@
@ApiModel(value = "FollowFollowerNoticeVo", description = "返回值")
public class FollowFollowerNoticeVo {
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
@ApiModelProperty("时间")
private Date createTime;
--
Gitblit v1.9.1