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

panlinlin

2021-03-01 418970eab27d313307d60fd4f2a187efcea260ff

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java

@@ -42,7 +42,7 @@
   public static final String CALLBACK_CMD_ALARM = "CALLBACK_ALARM";



   private Map<String, DeferredResult> map = new ConcurrentHashMap<String, DeferredResult>();

	


   public void put(String key, DeferredResult result) {

      map.put(key, result);

   }