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

648540858

2022-03-11 45e9fc880c61e12d6415755ee2a29f79fcf81fbb

 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java

@@ -150,7 +150,7 @@
            JSONObject result = new JSONObject();
            result.put("error", "channel[ " + code + " ] " + eventResult.msg);
            resultDeferredResult.setResult(result);
        });
        }, null);
        return resultDeferredResult;
    }