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/RadarAlarmData.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/RadarAlarmData.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/RadarAlarmData.java
index 926ad70..b3d437b 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/RadarAlarmData.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/RadarAlarmData.java
@@ -26,5 +26,6 @@
@Excel(name = "鎶ヨ鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date alarmTime;
private List<ArdAlarmRadar> ardAlarmRadars;
-
+ /**闆疯揪璺熻釜寮曞鏁版嵁*/
+ private List<ArdAlarmRadar> ardFollowRadars;
}
--
Gitblit v1.9.3