订单列表增加实际还车时间

src/main/java/com/sczx/order/dto/OrderSimpleDTO.java

@@ -1,16 +1,11 @@
 package com.sczx.order.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sczx.order.thirdpart.dto.CarModelSimpleDTO;
-import com.sczx.order.thirdpart.dto.CompanyStoreDTO;
-import com.sczx.order.thirdpart.dto.RentBatteyRuleDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * @Author: 张黎
@@ -64,5 +59,9 @@ public class OrderSimpleDTO {
     @ApiModelProperty("还车时间")
     private LocalDateTime endRentTime;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("实际还车时间")
+    private LocalDateTime actEndRentTime;
+
 
 }

src/main/resources/mapper/OrderMainMapper.xml

@@ -24,6 +24,7 @@
             o.order_status,
             o.first_order_time,
             o.end_rent_time,
+            o.act_end_rent_time,
             o.car_model_id,
             o.vehicle_id,
             c.license_plate,