From a5e8dc52dbf29b0ea4b39c00bfe8f88efb6aa76c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 28 九月 2021 20:58:41 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
index 80f9cc4..f1f8f92 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
@@ -1,11 +1,12 @@
package com.panzhihua.common.model.vos.neighbor;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
/**
* @auther lyq
@@ -47,9 +48,11 @@
private Integer isBoutique;
@ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("最后回复时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date replyAt;
@ApiModelProperty("邻里圈评论列表")
@@ -59,6 +62,24 @@
* 是否已经点赞 1 是 2 否
*/
@ApiModelProperty("是否已经点赞 1 是 2 否")
- private Integer haveSign;
+ private Integer haveSign = 2;
+
+ /**
+ * 发布类型（1.小程序发布 2.后台发布）
+ */
+ @ApiModelProperty("发布类型（1.小程序发布 2.后台发布）")
+ private Integer type;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("邻里圈话题名字")
+ private String topicName;
+
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
}
--
Gitblit v1.7.1