From e42d5134188b4e93ebb0580ef60034976c987f0f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 05 九月 2023 10:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmData.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmData.java b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmData.java
index c7b9d13..ddd0e13 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmData.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmData.java
@@ -26,4 +26,5 @@
     Double altitude;
     Integer count;//鏈鏁�
     Integer total;//鎬绘暟
+    String alarmType;
 }

--
Gitblit v1.9.3