From 128ccc7ff72242aa6e9519514327629c20ac0c58 Mon Sep 17 00:00:00 2001
From: panll <1018729+pan648540858@user.noreply.gitee.com>
Date: 星期三, 02 三月 2022 14:27:57 +0800
Subject: [PATCH] !6 update web_src/src/components/dialog/changePassword.vue. Merge pull request !6 from lanss/N/A
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
index edc940f..46be681 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
@@ -67,6 +67,8 @@
mediaServerId = null;
}
+ // catalogId 涓簄ull 鏌ヨ鏈湪骞冲彴涓嬪垎閰嶇殑鏁版嵁
+ // catalogId 涓嶄负null 鏌ヨ骞冲彴涓嬭繖涓紝鐩綍涓嬬殑閫氶亾
return gbStreamService.getAll(page, count, platformId, catalogId, query, pushing, mediaServerId);
}
--
Gitblit v1.8.0