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/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java | 15 +++++++++++++--
1 files changed, 13 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..52fc494 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
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.dtos.community;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,16 +16,26 @@
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 = "发布开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
@ApiModelProperty(value = "发布结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
@ApiModelProperty(value = "分页-当前页数", example = "1")
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