Merge pull request #365 from TristingChen/zlm-node-manage

648540858

2022-03-03 b019106c449cdb64b125aa2a913e7f8037c8d85d

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java

@@ -67,6 +67,8 @@
            mediaServerId = null;
        }

        // catalogId 为null 查询未在平台下分配的数据
        // catalogId 不为null 查询平台下这个，目录下的通道
        return gbStreamService.getAll(page, count, platformId, catalogId, query, pushing, mediaServerId);
    }