From 5259283cf7f0a70688e438e40de8a786eeb3c368 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Sat, 02 Sep 2023 14:59:46 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java | 8 ++++----
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java | 8 ++++----
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java
index 3f44d8c..e2119f2 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.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 @@
@Excel(name = "引导录像1")
private String recordUrl1;
/** 查看时间 */
- @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 */
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java
index 1d69f22..25d65fd 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.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 @@
@Excel(name = "引导录像2")
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 */
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