From e77c0102278c46bfbcc34cd7195dc8767306c147 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期二, 26 十二月 2023 16:07:42 +0800 Subject: [PATCH] 融云修改 --- ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) 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 c86db63..871d1d6 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 @@ -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,10 @@ @Excel(name = "绾害") private Double latitude; - /** 寮曞褰曞儚1 */ - @Excel(name = "寮曞褰曞儚1") - private String recordUrl1; - /** 寮曞褰曞儚2 */ - @Excel(name = "寮曞褰曞儚2") - private String recordUrl2; + /** 寮曞褰曞儚 */ + @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,5 +84,7 @@ private String RadarId; + /** 寮曞PTZ鍊� */ + private GuidePTZ guidePTZ; } -- Gitblit v1.9.3