From a70d0dfe221e06381b6e290d1dab85c9ab4fdc31 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 三月 2024 08:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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..436e982 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
@@ -3,14 +3,12 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 闆疯揪绉诲姩鎶ヨ瀵硅薄 ard_alarm_radar_move
- *
+ *
* @author ard
* @date 2023-09-02
*/
@@ -47,12 +45,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")
@@ -83,7 +79,9 @@
* 闆疯揪ID
*/
private String RadarId;
-
-
+ /**
+ * 浜曞彿
+ */
+ private String wellId;
}
--
Gitblit v1.9.3