diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java
index 0f92e65..45c1dce 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java
@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.util.Date;
 import java.util.List;
 
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
index 7e01433..5b2330f 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
@@ -82,7 +82,7 @@ public class OrderController extends BaseController {
             return error("参数错误");
         }
         // 退租
-        if (orderInfoDto.getOrderStatus().equals("5")) {
+  /*      if (orderInfoDto.getOrderStatus().equals("5")) {
             List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId());
             if (dtos.size() > 0) {
                 for (OrderDetailDto dto : dtos) {
@@ -96,7 +96,7 @@ public class OrderController extends BaseController {
                     }
                 }
             }
-        }
+        }*/
         // 取消
         if (orderInfoDto.getOrderStatus().equals("7")) {
             List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId());
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index 01a4410..51244f9 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -219,6 +219,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             d.device_weight as deviceWeight,
             d.device_count as deviceCount,
             d.type_id as typeId,
+            d.check_date as checkDate,
+            d.check_cycle as checkCycle,
             mt4.type_name as typeName,
             mt4.unit_name as unitName,
             mt4.manage_type as manageType,