From 0c3d9face27e194906bffe046a81b01e18faaef4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 四月 2021 16:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java
index 5bb7401..dfe9f63 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java
@@ -15,10 +15,10 @@
 public class PageQuestnaireDTO {
     @ApiModelProperty(value = "标题")
     private String title;
+    @ApiModelProperty(value = "用户Id")
+    private Long userId;
     @ApiModelProperty(value = "状态 0 调研中 1已停止")
     private Integer state;
-    @ApiModelProperty(value = "问卷参与者类型 0 全部 1 志愿者 2 党员")
-    private Integer parterType;
     @ApiModelProperty(value = "发布开始时间")
     private Date startTime;
     @ApiModelProperty(value = "发布结束时间")
@@ -27,4 +27,12 @@
     private Long pageNum;
     @ApiModelProperty(value = "分页-每页记录数", example = "10")
     private Long pageSize;
+    @ApiModelProperty("提供居民")
+    private Boolean forMasses;
+    @ApiModelProperty("提供党员")
+    private Boolean forParty=false;
+    @ApiModelProperty("提供志愿者")
+    private Boolean forVolunteer=false;
+    @ApiModelProperty("社区ID")
+    private Long communityId;
 }

--
Gitblit v1.7.1