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

dk-modules/sample/src/main/java/org/dromara/sample/rocketmq/RocketMqConsum.java

@@ -79,8 +79,8 @@ public class RocketMqConsum implements RocketMQListener<MessageExt> {
             }
 
         }else if(tags.equals("videoStopStart")){
-            HttpResultResponse httpResultResponse = liveStreamService.liveStop(videoId);
-            liveStreamService.liveStart(liveTypeDTO);
+            liveStreamService.liveStop(videoId);
+            HttpResultResponse httpResultResponse = liveStreamService.liveStart(liveTypeDTO);
             if (httpResultResponse.getCode() == 0 || httpResultResponse.getCode() ==  513012 ||  httpResultResponse.getCode() == 513003){
                 Map<String,Object> reqMap = new HashMap<>();
                 reqMap.put("deviceSn:",videoId.getDroneSn());