Merge branch 'tb-alipay' into test

device-api-service/src/main/java/com/xy/alipay/SpiDeviceServiceImpl.java

@@ -89,7 +89,7 @@ public class SpiDeviceServiceImpl implements SpiDeviceService {
                 .setFreezeStatus(status);
         //修改激活状态
         if (deviceStatusChangeNotifyDTO.getActiveStatus() != null && deviceStatusChangeNotifyDTO.getActiveStatus() == 1) {
-            if (deviceInfo == null || deviceInfo.getActiveState() != 1) {
+            if (deviceInfo.getActiveState() != 1) {
                 LocalDateTime now = LocalDateTime.now();
                 updateDeviceInfo.setActiveState(deviceStatusChangeNotifyDTO.getActiveStatus());
                 updateDeviceInfo.setActiveTime(now);