From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 d29266e..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
@@ -5,13 +5,16 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Author: llming
* @Description:调查问卷 问卷表
*/
@Data
@TableName(value = "com_act_questnaire")
-public class ComActQuestnaireDO extends BaseDO {
+public class ComActQuestnaireDO extends BaseDO implements Serializable {
+ private static final long serialVersionUID = 4525826123672211880L;
@TableId(type= IdType.AUTO)
private Long id;
/**
@@ -25,7 +28,7 @@
/**
* 状态 0 调研中 1已停止
*/
- private int state;
+ private Integer state;
/**
* 参与人数
*/
@@ -36,8 +39,21 @@
private Long communityId;
/**
- * 问卷参与者类型 0 全部 1 志愿者 2 党员
+ * 提供居民
*/
- private Long parterType;
+ private Boolean forMasses;
+ /**
+ * 提供党员
+ */
+ private Boolean forParty;
+ /**
+ * 提供志愿者
+ */
+ private Boolean forVolunteer;
+
+ /**
+ * 是否隐藏显示 0 显示 1 隐藏
+ */
+ private Integer isHide;
}
--
Gitblit v1.7.1