Merge branch 'refs/heads/2.7.0'

648540858

2024-04-24 b89af9a6936f15044a5d8f568ab691f796cfbec2

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