Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-04-15 dae6e068207ad1bff32dafd8c71f12d8a2a59aa2

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

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