Merge remote-tracking branch 'origin/master'

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

@@ -311,7 +311,8 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
                                 //修改设备年费注册信息
                                 if (result.getInt("code") == 200) {
                                     deviceAnnualFee.setRegisterStatus(true)
-                                            .setRegisterTime(now);
+                                            .setRegisterTime(now)
+                                            .setTimeout(now.plusDays(10));
                                     updateById(deviceAnnualFee);
                                     //发送环境切换指令
                                     JSONObject env = JSONUtil.parseObj(value);

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

@@ -911,7 +911,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                             .setMercId(auth.getMercId())
                             .setDeviceId(deviceInfo.getDeviceId())
                             .setDeviceType(deviceInfo.getDeviceType())
-                            .setTimeout(now.plusDays(3))
+                            .setTimeout(now)
                             .setCreateTime(now)
                             .setIsThis(true);
                 }