mirror of
https://gitee.com/pan648540858/wvp-GB28181-pro.git
synced 2026-05-25 06:27:50 +08:00
Merge branch '2.7.1' into 2.7.1-t
This commit is contained in:
commit
c2958d1fec
@ -411,10 +411,6 @@ public class PlatformController {
|
|||||||
// parentId = platform.getDeviceGBId();
|
// parentId = platform.getDeviceGBId();
|
||||||
// }
|
// }
|
||||||
|
|
||||||
if (platformId.equals(platform.getDeviceGBId())) {
|
|
||||||
parentId = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return storager.getChildrenCatalogByPlatform(platformId, parentId);
|
return storager.getChildrenCatalogByPlatform(platformId, parentId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user