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/ArdAlarmRadarFire.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 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 1b1c22c..3a4031a 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,16 +2,13 @@
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;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 闆疯揪闃茬伀鎶ヨ瀵硅薄 ard_alarm_radar_fire
- *
+ *
* @author ard
* @date 2023-09-02
*/
@@ -82,9 +79,8 @@
* 闆疯揪ID
*/
private String radarId;
-
- /** 寮曞PTZ鍊� */
- private GuidePTZ guidePTZ;
-
-
+ /**
+ * 浜曞彿
+ */
+ private String wellId;
}
--
Gitblit v1.9.3