Merge branch 'xinchuang' into wvp-28181-2.0

648540858

2023-09-15 2d423d9668312fe75986af3c78c0228ce352e48d

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

@@ -511,6 +511,13 @@
        if (!ObjectUtils.isEmpty(device.getSdpIp())) {
            deviceInStore.setSdpIp(device.getSdpIp());
        }
        if (!ObjectUtils.isEmpty(device.getPassword())) {
            deviceInStore.setPassword(device.getPassword());
        }
        if (!ObjectUtils.isEmpty(device.getStreamMode())) {
            deviceInStore.setStreamMode(device.getStreamMode());
        }


        //  目录订阅相关的信息
        if (device.getSubscribeCycleForCatalog() > 0) {