Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mrjackwang

2022-02-27 f65d2730e03875280ea1940c8030b67b5572e755

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java

@@ -152,10 +152,10 @@
         msg.setData("获取设备预置位超时");
         resultHolder.invokeResult(msg);
      });
      resultHolder.put(key, uuid, result);
      if (resultHolder.exist(key, null)) {
         return result;
      }
      resultHolder.put(key, uuid, result);
      cmder.presetQuery(device, channelId, event -> {
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);