Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-16 59fcc48c8589b9df2af744fd6c77854061a52f54

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

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