diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordAlarmInfo.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordAlarmInfo.java index f56b934..7e89706 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordAlarmInfo.java +++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordAlarmInfo.java @@ -38,15 +38,15 @@ public class DmsRecordAlarmInfo extends DmsBaseEntity { /** * 报警开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "报警开始时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "报警开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date alarmBeginTime; /** * 报警结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "报警结束时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "报警结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date alarmEndTime; /** @@ -94,8 +94,8 @@ public class DmsRecordAlarmInfo extends DmsBaseEntity { /** * 处理时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date handleTime; /**