From 2ba0e4c222d707b163d97afb122d3183c99dbf7a Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 02 十二月 2024 09:31:19 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5
---
src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
index 84df139..b6abfbb 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
@@ -1,9 +1,11 @@
package com.mzl.flower.dto.response.payment;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.mzl.flower.base.AbstractTransDTO;
import com.mzl.flower.base.annotation.DictTrans;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -79,6 +81,11 @@
@ApiModelProperty(value = "下单时间")
private LocalDateTime orderTime;
- @ApiModelProperty(value = "收货时间")
+ @ApiModelProperty(value = "收货日期")
+ @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
+ @DateTimeFormat
private LocalDateTime receiveTime;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
}
--
Gitblit v1.9.3