Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-15 cf8a22f50b81fa30abaa518bdce660cd65deabea

 src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java

@@ -169,7 +169,6 @@
      // 超时处理
      result.onTimeout(()->{
         logger.warn(String.format("设备预览/回放停止超时，streamId：%s ", streamId));

         RequestMessage msg = new RequestMessage();
         msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
         msg.setData("Timeout");