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

648540858

2020-11-09 2e9b4b4e5e86c84088c45563cd61d18d8c7e5fea

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

@@ -42,6 +42,7 @@
   public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId,
   Integer getEncoding) {

      if (getEncoding == null) getEncoding = 0;
      Device device = storager.queryVideoDevice(deviceId);
      StreamInfo streamInfo = storager.queryPlayByDevice(deviceId, channelId);

@@ -146,3 +147,4 @@
      }
   }
}