Merge remote-tracking branch 'origin/master'

Administrator

2023-07-28 c45ce58884c59ddf8a6051ba370215e6f62adeb8

 ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java

@@ -1,6 +1,6 @@
package com.ruoyi.utils.mqtt;

import com.ruoyi.alarm.globalAlarm.service.impl.GlobalAlarmServiceImpl;
import com.ruoyi.alarm.global.service.impl.GlobalAlarmServiceImpl;
import com.ruoyi.common.utils.spring.SpringUtils;
import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.client.mqttv3.*;