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

zhaowenyu

2025-12-12 69486342b6bfe3f58f6c76efa1693591117b78d1

 ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java

@@ -191,7 +191,7 @@
            e.printStackTrace();
        }
        // 设备控制进度消息websocket发给前端
        _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.PROGRESS.getType(), dockProgress);
        _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.PROGRESS.getType(), dockProgress, "");

        if (receiver.getNeedReply() != null && receiver.getNeedReply() == 1) {
            String topic = headers.get(MqttHeaders.RECEIVED_TOPIC) + TopicConst._REPLY_SUF;