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

648540858

2022-03-10 4e3247e44e5d7a851a00e83995902e3876ae7cdc

 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;
    }