Merge branch 'master' into test

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

@@ -94,13 +94,13 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
         if (deviceAnnualFee == null) {
             return R.fail("设备未分配到年费商家");
         }
+        deviceAnnualFee.setRunPlatform(check.getRunPlatform());
+        updateById(deviceAnnualFee);
         String timeout = DataTime.toString(deviceAnnualFee.getTimeout());
         int i = DataTime.stringContrast(timeout, DataTime.getSring());
         if (i < 0) {
             return R.fail("已欠费");
         }
-        deviceAnnualFee.setRunPlatform(check.getRunPlatform());
-        updateById(deviceAnnualFee);
         return R.ok(timeout);
     }