Merge branch 'refs/heads/master' into develop-add-api-key

leesam

2024-04-10 ce950dea4aef933a12e78e4fe1f535ba9a83c3df

 src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java

old mode 100644
new mode 100755
@@ -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);