Merge branch 'master' into master-果昔项目

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)
+                            .setTimeout(now.plusDays(3))
                             .setCreateTime(now)
                             .setIsThis(true);
                 }