Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-14 96b35b89e061cc90cd6404fd9941102eedab36ab

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

@@ -52,7 +52,9 @@
            poleBinding.setDeviceCode(param.getDeviceCode());
            return save(poleBinding);
        } else {
            throw new BusinessException("该设备已绑定过");
            one.setPoleId(poleId);
            one.setDeviceType(param.getDeviceType());
            return updateById(one);
        }
    }