Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-11 e14c003f6ff4e78740359828c39674507f134c45

 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();