处理冲突

xiaoxie

2022-05-23 07fa589e06415ca41fc29d22c7c8f3f1b4917147

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java

@@ -89,7 +89,7 @@
                });

        // 获取zlm信息
        logger.info("[zlm接入]等待默认zlm中...");
        logger.info("[zlm] 等待默认zlm中...");

        // 获取所有的zlm， 并开启主动连接
        List<MediaServerItem> all = mediaServerService.getAllFromDatabase();