Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-19 4b6440a58c6402eacb09e9eba67f988bd65000a4

 ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java

@@ -20,4 +20,5 @@
    public void receiveAlarm(String topic,String message);
    public Map<String,Object> selectAlarmLogsCount();
    Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize);
    public List<GlobalAlarmData> selectThermalMap(GlobalAlarmCondition condition);
}