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/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
index 9b360d7..dc7fd22 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
@@ -12,7 +12,7 @@
 @Data
 public class QuestnaireVO {
     @ApiModelProperty(value = "问卷调查Id")
-    private Long queId;
+    private Long questId;
     @ApiModelProperty(value = "类型 0单选1多选2问答题", example = "0")
     private Integer type;
     @ApiModelProperty(value = "问卷标题")
@@ -21,6 +21,12 @@
     private String queDescribe;
     @ApiModelProperty(value = "问卷参与者类型 0 全部 1 志愿者 2 党员", example = "0")
     private Integer parterType;
-    @ApiModelProperty(value = "题目", example = "0")
+    @ApiModelProperty(value = "提供居民", example = "true")
+    private Boolean forMasses;
+    @ApiModelProperty(value = "提供党员", example = "true")
+    private Boolean forParty;
+    @ApiModelProperty(value = "提供志愿者", example = "true")
+    private Boolean forVolunteer;
+    @ApiModelProperty(value = "题目")
     private List<QuestnaiteSubVO> questnaiteSubVOS;
 }

--
Gitblit v1.7.1