From 562dbb0857e4e6f7a250d69752270c0c165d5141 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 07 二月 2024 20:37:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main-dev' into main-dev

---
 src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
old mode 100644
new mode 100755
index b53c2d3..b0ff011
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
@@ -342,9 +342,9 @@
 
 	int addCatalog(PlatformCatalog platformCatalog);
 
-	PlatformCatalog getCatalog(String id);
+	PlatformCatalog getCatalog(String platformId, String id);
 
-	int delCatalog(String id);
+	int delCatalog(String platformId, String id);
 
 	int updateCatalog(PlatformCatalog platformCatalog);
 

--
Gitblit v1.8.0