Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-11 2c52eaf28f9b8a666547e1307a76c3032598e57f

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

@@ -288,6 +288,7 @@
            }
            equipmentInfo.setEquipmentCreateTime(one.getUpdateTime());
            equipmentInfo.setEquipmentMac(one.getMcuUdid());
            equipmentInfo.setEquipmentName(one.getC3Name());
        }
        return equipmentInfo;
    }