From 51ba2f4fa0708438b0aecb49e24d2482fb8c4af2 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 06 八月 2021 10:50:46 +0800
Subject: [PATCH] 实有人口新增模板导入

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 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..ee26c33 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
@@ -24,13 +24,13 @@
      * 分页-当前页数
      */
     @ApiModelProperty(value = "分页-当前页数",example = "1")
-    private Long pageNum;
+    private Long pageNum = 1L;
 
     /**
      * 分页-每页记录数
      */
     @ApiModelProperty(value = "分页-每页记录数",example = "10")
-    private Long pageSize;
+    private Long pageSize = 10L;
 
     /**
      * 社区id
@@ -39,12 +39,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