From 99ca25c5d2ee1e4d050f3aee96757bdfea195fc6 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 18 六月 2021 09:57:09 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 468138f..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;
@@ -20,15 +21,17 @@
@ApiModelProperty(value = "状态 0 调研中 1已停止")
private Integer state;
@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=false;
+ private Boolean forMasses;
@ApiModelProperty("提供党员")
private Boolean forParty=false;
@ApiModelProperty("提供志愿者")
--
Gitblit v1.7.1