From 7eedb5a250515610f1df1fa0730cf779f0525add Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 08 七月 2021 08:56:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
index 763aac9..7b81344 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
@@ -22,6 +22,9 @@
     @ApiModelProperty("邻里圈查询类型(1.热门 2.最新 3.精品)")
     private Integer type = 1;
 
+    @ApiModelProperty("话题id")
+    private Long topicId;
+
     @ApiModelProperty(value = "社区id",hidden = true)
     private Long communityId;
 

--
Gitblit v1.7.1