Merge branch 'master' of https://github.com/swwheihei/wvp.git

songww

2020-05-09 2e778e342afe67cd9f2e40ceec326732fa1730c1

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

@@ -26,7 +26,7 @@
   @Autowired
   private IVideoManagerStorager storager;
   
   @GetMapping("/play/{deviceId}_{channelId}")
   @GetMapping("/play/{deviceId}/{channelId}")
   public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId){
      
      Device device = storager.queryVideoDevice(deviceId);