Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

hotcoffie

2022-05-23 3aa2665fb254642985ba130cb7d65854b68b9d95

 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();