Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

648540858

2022-07-03 e78c402a248ff252ee93e724396c62d806087fab

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java

@@ -129,7 +129,7 @@
    //                        if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Longitude"))) {//如果包含位置信息，就更新一下位置
    //                            processNotifyMobilePosition(evt, itemDevice);
    //                        }
                                    DeviceChannel deviceChannel = XmlUtil.channelContentHander(itemDevice);
                                    DeviceChannel deviceChannel = XmlUtil.channelContentHander(itemDevice, device);
                                    deviceChannel.setDeviceId(take.getDevice().getDeviceId());

                                    channelList.add(deviceChannel);