Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-21 97be33990c1a082e5e55b33b8b88bb7360537d54

 ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmData.java

@@ -26,4 +26,5 @@
    Double altitude;
    Integer count;//未读数
    Integer total;//总数
    String alarmType;
}