From 60784a329fd3cf9f4b6a75b8dc39ff79bd907dc6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 02 三月 2022 09:16:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 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 3027fee..6c7e0cb 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,10 +1,12 @@
package com.panzhihua.common.model.vos.neighbor;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
/**
* @auther lyq
@@ -46,6 +48,7 @@
private Integer isBoutique;
@ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("最后回复时间")
@@ -69,4 +72,42 @@
@ApiModelProperty("近3天浏览量")
private Integer lastViewsNum;
+ /**
+ * 驳回原因
+ */
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
+
+ /**
+ * 是否已经点赞 1 是 2 否
+ */
+ @ApiModelProperty("是否已经点赞 1 是 2 否")
+ private Integer haveSign = 2;
+
+ /**
+ * 发布类型（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;
+
+ @ApiModelProperty("话题id")
+ private String topicId;
+
+ @ApiModelProperty("热度")
+ private Long hotNum;
}
--
Gitblit v1.7.1