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

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -1396,7 +1396,7 @@ public class RoomServiceImpl implements RoomService {
             // 发送消息
             if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
                 // 腾讯消息
-                pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE).content(messageContent));
+                pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE).content(notifyContent));
             } else {
                 // 融云消息
                 imHelper.publishMessage(authUser.getId().toString(), roomId, deviceResourceMessage, 1);