Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-10 64be28ed77138a971f353119aeadc97025a0a06d

 src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java

@@ -149,7 +149,7 @@
        dynamicTask.stop(registerTaskKey);
        // 注销旧的
        try {
            if (parentPlatformOld.isStatus()) {
            if (parentPlatformOld.isStatus() && parentPlatformCatchOld != null) {
                logger.info("保存平台{}时发现旧平台在线，发送注销命令", parentPlatformOld.getServerGBId());
                commanderForPlatform.unregister(parentPlatformOld, parentPlatformCatchOld.getSipTransactionInfo(), null, eventResult -> {
                    logger.info("[国标级联] 注销成功， 平台：{}", parentPlatformOld.getServerGBId());