From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 15 四月 2024 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/RadarAlarmData.java | 2 +-
1 files changed, 1 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 438a133..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
@@ -27,5 +27,5 @@
private Date alarmTime;
private List<ArdAlarmRadar> ardAlarmRadars;
/**闆疯揪璺熻釜寮曞鏁版嵁*/
- private ArdAlarmRadar ardFollowRadars;
+ private List<ArdAlarmRadar> ardFollowRadars;
}
--
Gitblit v1.9.3