Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-04 d72e7d16776d31c2fd29b60929e896bccded3029

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

@@ -57,7 +57,7 @@
            throw new BusinessException("找不到水质设备");
        }
        //删除摄水质设备前需要先解绑
        poleBindingService.unBindPole(waterQualityEquipment.getWaterQualityEquipmentCode());
        poleBindingService.unBindPole(null, waterQualityEquipment.getWaterQualityEquipmentCode());

        return removeById(Id);
    }