diff --git a/src/main/java/com/sczx/car/dto/StoreCarDTO.java b/src/main/java/com/sczx/car/dto/StoreCarDTO.java index f917520..7cde2d8 100644 --- a/src/main/java/com/sczx/car/dto/StoreCarDTO.java +++ b/src/main/java/com/sczx/car/dto/StoreCarDTO.java @@ -1,10 +1,12 @@ package com.sczx.car.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDateTime; @ApiModel(value = "门店车辆信息") @Data @@ -59,4 +61,8 @@ public class StoreCarDTO { @ApiModelProperty("订单状态") private String orderStatus; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("应用时间") + private LocalDateTime pickCarTime; } diff --git a/src/main/resources/mapper/CarMapper.xml b/src/main/resources/mapper/CarMapper.xml index 2fdecbb..6725881 100644 --- a/src/main/resources/mapper/CarMapper.xml +++ b/src/main/resources/mapper/CarMapper.xml @@ -30,6 +30,7 @@ zcm.image, zom.order_status, zom.order_no, + zom.pick_car_time, zc.update_time, zc.store_id, zc.iot_code,