From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +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 | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 7c0ca51..838cac7 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
@@ -6,6 +6,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* @Author: llming
@@ -18,18 +19,20 @@
private String title;
@ApiModelProperty(value = "用户Id")
private Long userId;
- @ApiModelProperty(value = "状态 0 调研中 1已停止")
- private Integer state;
+ @ApiModelProperty(value = "状态 1待发布 2调研中 3已停止")
+ private List<Integer> states;
@ApiModelProperty(value = "发布开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date startTime;
+ private String startTime;
@ApiModelProperty(value = "发布结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date endTime;
+ private String endTime;
@ApiModelProperty(value = "分页-当前页数", example = "1")
- private Long pageNum;
+ private Long pageNum = 1L;
@ApiModelProperty(value = "分页-每页记录数", example = "10")
- private Long pageSize;
+ private Long pageSize = 10L;
+ @ApiModelProperty(value = "广告位置（1.首页弹窗 2.首页顶部 3.首页应用）")
+ private Integer advertPosition;
+ @ApiModelProperty(value = "身份（1.全部居民 2.党员 3.志愿者）")
+ private Integer identity;
@ApiModelProperty("提供居民")
private Boolean forMasses;
@ApiModelProperty("提供党员")
--
Gitblit v1.7.1