From 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 16:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
index 68c7931..408f5c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -98,6 +98,9 @@
     @ApiModelProperty(value = "社区id",hidden = true)
     private Long communityId;
 
+    @ApiModelProperty(value = "社区名称")
+    private String communityName;
+
     @ApiModelProperty(value = "当前页数",example="1")
     private Long pageNum;
 
@@ -145,5 +148,7 @@
     @ApiModelProperty("党员活动是否个人发布  1 是 0 否")
     private Integer isPerson;
 
+    @ApiModelProperty(value = "查询筛选:0-本小区 1-全部")
+    private Integer choice;
 
 }

--
Gitblit v1.7.1