From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 661231e..1b1c22c 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
@@ -2,6 +2,7 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.alarm.global.domain.GuidePTZ;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -47,12 +48,9 @@
@Excel(name = "绾害")
private Double latitude;
- /** 寮曞褰曞儚2 */
- @Excel(name = "寮曞褰曞儚2")
- private String recordUrl2;
- /** 寮曞褰曞儚1 */
- @Excel(name = "寮曞褰曞儚1")
- private String recordUrl1;
+ /** 寮曞褰曞儚 */
+ @Excel(name = "寮曞褰曞儚")
+ private String recordUrl;
/** 鏌ョ湅鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鏌ョ湅鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -85,6 +83,8 @@
*/
private String radarId;
+ /** 寮曞PTZ鍊� */
+ private GuidePTZ guidePTZ;
}
--
Gitblit v1.9.3