Merge branch 'master' into test

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

@@ -233,8 +233,11 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
                 deviceInfo.setBusyState(1);
                 //激活设备
                 if (deviceChargingHistory.getChargingType() != 100) {
-                    if (deviceInfo.getActiveState() == 2 && deviceInfo.getActiveTime() == null) {
-                        deviceInfo.setActiveState(1).setActiveTime(now);
+                    if (deviceInfo.getActiveState() == 2) {
+                        deviceInfo.setActiveState(1);
+                    }
+                    if (!Emptys.check(deviceInfo.getActiveTime())) {
+                        deviceInfo.setActiveTime(now);
                     }
                 }
                 updateDeviceInfos.add(deviceInfo);