From 58a8acceb63d52377da4b837e859f2e03d2bce1b Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 14 十月 2024 08:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v3' into master-v2
---
src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
index b2dd6bf..75794f2 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
@@ -52,4 +52,9 @@
@JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
@DateTimeFormat
private LocalDateTime checkTime;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ private String orderId;
}
--
Gitblit v1.9.3