From 9109a60d73507e411020c32c8f66fb5ba6fef80c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 16:43:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
index cf871b0..03f9fba 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
@@ -1,6 +1,7 @@
package com.panzhihua.common.model.dtos.neighbor;
import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -47,4 +48,11 @@
@ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
private Integer belongType;
+ @ApiModelProperty("话题id")
+ private Long topicId;
+
+ private Integer solveStatus;
+
+ @ApiModelProperty(value = "社区id集合", hidden = true)
+ private List<Long> communityIds;
}
--
Gitblit v1.7.1