From acf82ec7a26f558d535563d875258487034cab9e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Nov 2021 09:37:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9C=8D=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/demand/DemandRecResultDTO.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
index 454bee4277..c2031ddb5a 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
@@ -39,7 +39,7 @@ public class DemandRecResultDTO implements Serializable {
     private String demandUserMobile;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private String wantServiceTime;
+    private Date wantServiceTime;
 
     /**
      * 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
@@ -56,6 +56,7 @@ public class DemandRecResultDTO implements Serializable {
     /**
      * 取消时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date cancelTime;
 
     /**