Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-07-19 db6dd3f7550c433f06475540a13598cbeed12d08

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

@@ -121,7 +121,7 @@
      // 录像查询以channelId作为deviceId查询
      resultHolder.put(key, uuid, result);

      playService.play(newMediaServerItem, deviceId, channelId, (code, msg, data) -> {
      playService.play(newMediaServerItem, deviceId, channelId, null, (code, msg, data) -> {
         WVPResult<StreamContent> wvpResult = new WVPResult<>();
         if (code == InviteErrorCode.SUCCESS.getCode()) {
            wvpResult.setCode(ErrorCode.SUCCESS.getCode());