Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-30 8fd99421ca71b594f1fd847da1928c328bfef878

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

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