From 81b386362237a6c85006b73824a95cdedb591131 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 08 十二月 2022 09:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
index 1fab134..21ae2a9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
@@ -57,4 +57,12 @@
@ApiModelProperty(value = "展示状态，小程序获取不同状态的投票列表 1.进行中 2.已结束", allowableValues = "1,2")
private Integer displayStatus;
+
+ @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事）")
+ private Integer contentType;
+
+ @ApiModelProperty(value = "是否党员", hidden = true)
+ private Integer isPbMember;
+ @ApiModelProperty(value = "是否志愿者", hidden = true)
+ private Integer isVolunteer;
}
--
Gitblit v1.7.1