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

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java

@@ -1,7 +1,9 @@
 package com.epmet.dto.form;
 
 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;
@@ -32,10 +34,16 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable {
      * 来源地区名称
      */
     private String sourceAddress;
+
     /**
      * 来到本地时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 
     /**