From 039fbf7e243d4bf0f46b44e7dae2a5d36e978056 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 14:32:53 +0800
Subject: [PATCH] Merge branch 'talk' into main-dev

---
 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
index 5381a3a..44266de 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -185,7 +185,7 @@
         }
         try {
             cmder.streamByeCmd(device, code, streamInfo.getStream(), null);
-        } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
+        } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException  e) {
             JSONObject result = new JSONObject();
             result.put("error","鍙戦�丅YE澶辫触锛�" + e.getMessage());
             return result;

--
Gitblit v1.8.0