Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-23 7e49fc48065211df6bbb6b6f43fa747cdfbf4727

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

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