Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-11 2c52eaf28f9b8a666547e1307a76c3032598e57f

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

@@ -225,6 +225,7 @@
        if (one != null) {
            equipmentInfo.setEquipmentCreateTime(one.getAddTime());
            equipmentInfo.setEquipmentMac(one.getDeviceSerial());
            equipmentInfo.setEquipmentName(one.getDeviceName());
        }

        String token = getAccessToken();
@@ -401,7 +402,7 @@

        boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(one.getDeviceSerial(), PoleBindingEnums.MONITOR);
        if (!belong) {
            throw new RuntimeException("该设备不属于您,不能修改设备信息");
            throw new BusinessException("该设备不属于您,不能修改设备信息");
        }
        if (one != null) {
            one.setNote(notes);