From 8ef3693f9a10ebdb2f54a61bd81a2c600c3d8813 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Jun 2022 11:50:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

---
 src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java
index 8c5c0ac..b44fb01 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java
@@ -21,6 +21,9 @@
     @ApiModelProperty(value = "作者")
     private String author;
 
+    @ApiModelProperty(value = "作者所属单位")
+    private String authorBelong;
+
     @ApiModelProperty(value = "描述")
     private String remark;
 
@@ -40,7 +43,7 @@
     private String atlas;
 
     @ApiModelProperty(value = "发布时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date releaseTime;
 
     @ApiModelProperty(value = "是否立即发布 0:否 1:是")

--
Gitblit v1.9.1