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

xuhy

2025-06-16 71d23d994445025d9eaf18c86bbdcf82f632bf83

 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/callback/PushCallback.java

@@ -36,7 +36,7 @@
        if (client == null || !client.isConnected()) {
            System.out.println("连接断开，正在重连....");
            int[] Qos  = {0};
            String[] topic1 = {TopicConstants.GPS_LOCATION};
            String[] topic1 = {TopicConstants.CHARGE_PILE_CODE};
            try {
                client.connect(options);
                client.subscribe(topic1, Qos);