From a4aa79a8fd9a40b34bac8ebb153f7ab1977282d3 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 15:45:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java
index ddbed8a..db3abbf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java
@@ -28,7 +28,7 @@
     /**
      * 状态 0 调研中 1已停止
      */
-    private int state;
+    private Integer state;
     /**
      * 参与人数
      */
@@ -39,9 +39,17 @@
     private Long communityId;
 
     /**
-     * 问卷参与者类型 0 全部 1 志愿者 2 党员
+     * 提供居民
      */
-    private Integer parterType;
+    private Boolean forMasses;
+    /**
+     * 提供党员
+     */
+    private Boolean forParty;
+    /**
+     * 提供志愿者
+     */
+    private Boolean forVolunteer;
 
     /**
      * 是否隐藏显示 0 显示 1 隐藏

--
Gitblit v1.7.1