Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-11 da823ef0819982dfa74bb0b7a9ce6d534d2fcc2d

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java

@@ -85,7 +85,7 @@
        }

        //删除摄像头设备前需要先解绑
        poleBindingService.unBindPole(monitor.getDeviceSerial());
        poleBindingService.unBindPole(null, monitor.getDeviceSerial());
        return removeById(Id);
    }