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

4 years ago · 553119ddd3
1 changed files with 4 additions and 4 deletions
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java
@ -30,11 +30,11 @@ public class GridMemberDataAnalysisFromDTO {
    @NotBlank(message = "请选择组织类型", groups = { listGridMemberDatas4PcWork.class })
    private String orgType;

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

-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyyMMdd")
+    @JsonFormat(pattern = "yyyyMMdd")
    private Date endTime;
 }