From 1775b1aa42989c6eb4f095c53d4882674314690d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Nov 2021 17:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/demand/UserDemandPageFormDTO.java   | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java
index 58816c7a77..2f8bb4b401 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java
@@ -43,16 +43,12 @@ public class UserDemandPageFormDTO extends PageFormDTO implements Serializable {
     /**
      * 上报时间开始
      */
-    @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date reportStartTime;
+    private String reportStartTime;
 
     /**
      * 上报时间截止
      */
-    @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date reportEndTime;
+    private String reportEndTime;
 
     /**
      * 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
@@ -75,14 +71,10 @@ public class UserDemandPageFormDTO extends PageFormDTO implements Serializable {
     /**
      * 希望服务时间开始
      */
-    @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date wantServiceStartTime;
+    private String wantServiceStartTime;
 
     /**
      * 希望截止
      */
-    @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date wantServiceEndTime;
+    private String wantServiceEndTime;
 }