From 197a596d8787eaab061190dc66977e33b6bcee96 Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期三, 06 九月 2023 14:27:00 +0800 Subject: [PATCH] 优化电子围栏报警触发条件 --- ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java index be0ceda..dcc155c 100644 --- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java +++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java @@ -33,8 +33,8 @@ private String alarmType; /** 鎶ヨ鏃堕棿 */ - @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 alarmTime; /** 缁忓害 */ @@ -52,8 +52,8 @@ private String recordUrl2; /** 鏌ョ湅鏃堕棿 */ - @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 viewTime; /** 鐢ㄦ埛ID */ -- Gitblit v1.9.3