From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
index f3ca0e7..e41a5a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
@@ -1,5 +1,6 @@
 package com.panzhihua.common.model.vos.neighbor;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -46,6 +47,7 @@
     private Integer isBoutique;
 
     @ApiModelProperty("发布时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createAt;
 
     @ApiModelProperty("最后回复时间")
@@ -81,4 +83,24 @@
     @ApiModelProperty("是否已经点赞 1 是 2 否")
     private Integer haveSign;
 
+    /**
+     * 发布类型(1.小程序发布  2.后台发布)
+     */
+    @ApiModelProperty("发布类型(1.小程序发布  2.后台发布)")
+    private Integer type;
+
+    /**
+     * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
+     */
+    @ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
+    private Integer status;
+
+    /**
+     * 社区id
+     */
+    @ApiModelProperty("社区id")
+    private Long communityId;
+
+    @ApiModelProperty("话题名称")
+    private String topicName;
 }

--
Gitblit v1.7.1