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

3 years ago · c1ff5763a1
1 changed files with 2 additions and 6 deletions
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
@ -38,13 +38,9 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable {
    /**
     * 来到本地时间
     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date startDate;
+    private String startDate;

-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date endDate;
+    private String endDate;

    /**
     * token里设置