Merge branch '2.7.0'

648540858

2024-04-08 a890b62fa1bbacd1a6156cbccf59def8b7cfe262

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

@@ -164,7 +164,7 @@
            return 0;
        }
        if (ObjectUtils.isEmpty(catalogId)) {
            catalogId = null;
           catalogId = null;
        }

        List<DeviceChannel> deviceChannels = platformChannelMapper.queryAllChannelInCatalog(platformId, catalogId);