Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/DeviceChargingServiceImpl.java

@@ -231,6 +231,10 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
                         .setDeviceId(deviceChargingHistory.getDeviceId());
                 deviceInfo.setFreezeStatus(1);
                 deviceInfo.setBusyState(1);
+                //激活设备
+                if (deviceChargingHistory.getChargingType() != 100) {
+                    deviceInfo.setActiveState(1);
+                }
                 updateDeviceInfos.add(deviceInfo);
             }
             updateDeviceCharging.add(deviceCharging);