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

648540858

2022-03-11 45e9fc880c61e12d6415755ee2a29f79fcf81fbb

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

@@ -103,7 +103,7 @@
        deviceChannel.setStatus(gbStream.isStatus()?1:0);
        deviceChannel.setParentId(catalogId ==null?gbStream.getCatalogId():catalogId);
        deviceChannel.setRegisterWay(1);
        deviceChannel.setCivilCode(sipConfig.getDomain());
        deviceChannel.setCivilCode(sipConfig.getDomain().substring(0, sipConfig.getDomain().length() - 2));
        deviceChannel.setModel("live");
        deviceChannel.setOwner("wvp-pro");
        deviceChannel.setParental(0);