From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 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 3027fee..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("最后回复时间")
@@ -69,4 +71,36 @@
@ApiModelProperty("近3天浏览量")
private Integer lastViewsNum;
+ /**
+ * 驳回原因
+ */
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
+
+ /**
+ * 是否已经点赞 1 是 2 否
+ */
+ @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