From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java
index 1706212..a6952f3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java
@@ -1,19 +1,16 @@
package com.panzhihua.common.model.dtos.community;
+import java.io.Serializable;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
-import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.io.Serializable;
-import java.util.Date;
-
/**
- * 分页查询巡查记录DTO
+ * 分页查询巡查记录DTO
*/
@Data
@ApiModel("分页查询巡查记录DTO")
@@ -23,14 +20,14 @@
/**
* 分页-当前页数
*/
- @ApiModelProperty(value = "分页-当前页数",example = "1")
- private Long pageNum;
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
/**
* 分页-每页记录数
*/
- @ApiModelProperty(value = "分页-每页记录数",example = "10")
- private Long pageSize;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
/**
* 社区id
@@ -39,12 +36,18 @@
private Long communityId;
@ApiModelProperty("巡查开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date patrolAtBegin;
+ private String patrolAtBegin;
@ApiModelProperty("巡查结束时间")
+ private String patrolAtEnd;
+
+ @ApiModelProperty(value = "巡查开始时间(日期格式)", hidden = true)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date patrolAtEnd;
+ private Date patrolAtBeginDate;
+
+ @ApiModelProperty(value = "巡查结束时间(日期格式)", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date patrolAtEndDate;
/**
* (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
--
Gitblit v1.7.1