Merge branch 'master' into test

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

@@ -70,7 +70,7 @@ public class SpiDeviceServiceImpl implements SpiDeviceService {
         save.setCode(deviceErrorRecordTypesEnum.getCode());
         save.setMsg(deviceAlarmNotifyDTO.getFaultMsg());
         deviceEventMsgService.save(save);
-        return SpiResponseConst.SPI_SUCCESS;
+        return SpiResponseConst.SUCCESS;
     }
 
     @Override
@@ -120,6 +120,6 @@ public class SpiDeviceServiceImpl implements SpiDeviceService {
                 }
             }
         }
-        return SpiResponseConst.SPI_SUCCESS;
+        return SpiResponseConst.SUCCESS;
     }
 }