Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-12 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479

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

@@ -15,6 +15,7 @@
 **/
public interface IGlobalAlarmService {
    public List<GlobalAlarmData> selectAlarmLogs(GlobalAlarmCondition condition);
    public List<GlobalAlarmData> selectAlarmLogsAll();
    Object updateAlarmViewTime(GlobalAlarmCondition condition);
    public void receiveAlarm(String topic,String message);
    public Map<String,Object> selectAlarmLogsCount();