Merge remote-tracking branch 'origin/dev_ic_v2' into develop

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java

@@ -1,12 +1,9 @@
 package com.epmet.dto.form.demand;
 
 import com.epmet.commons.tools.dto.form.PageFormDTO;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.util.Date;
 
 @Data
 public class UserDemandPageFormDTO extends PageFormDTO implements Serializable {
@@ -43,16 +40,12 @@ public class UserDemandPageFormDTO extends PageFormDTO implements Serializable {
     /**
      * 上报时间开始
      */
-    @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd")
+    private String reportStartTime;
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date reportStartTime;
 
     /**
      * 上报时间截止
      */
-    @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd")
+    private String reportEndTime;
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date reportEndTime;
 
     /**
      * 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
@@ -75,14 +68,10 @@ public class UserDemandPageFormDTO extends PageFormDTO implements Serializable {
     /**
      * 希望服务时间开始
      */
-    @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd")
+    private String wantServiceStartTime;
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date wantServiceStartTime;
 
     /**
      * 希望截止
      */
-    @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd")
+    private String wantServiceEndTime;
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date wantServiceEndTime;
 }