ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
@@ -43,11 +43,7 @@ * 报警时间 */ @ApiModelProperty(value = "报警时间") <<<<<<< .mine @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") ======= @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") >>>>>>> .theirs private LocalDateTime alarmTime;
