From badedc1e9f70d33d858c28ad8784309b19116dae Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Sat, 9 Aug 2025 00:02:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AE=9E=E9=99=85=E8=BF=98=E8=BD=A6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sczx/order/dto/OrderSimpleDTO.java | 9 ++++----- src/main/resources/mapper/OrderMainMapper.xml | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sczx/order/dto/OrderSimpleDTO.java b/src/main/java/com/sczx/order/dto/OrderSimpleDTO.java index 412c921..04eb9a0 100644 --- a/src/main/java/com/sczx/order/dto/OrderSimpleDTO.java +++ b/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; + } diff --git a/src/main/resources/mapper/OrderMainMapper.xml b/src/main/resources/mapper/OrderMainMapper.xml index bd87640..d031237 100644 --- a/src/main/resources/mapper/OrderMainMapper.xml +++ b/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,