From b1bef8fac3c0553f87b7047673123b23b68daa49 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 十二月 2024 11:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java | 12 ++++++++++++
1 files changed, 12 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..8a25482 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,16 @@
@JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
@DateTimeFormat
private LocalDateTime checkTime;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ private String orderId;
+
+ private Long supplierId;//供应商id
+
+ private String settlementId;
+
+ private String orderItemId;
+
}
--
Gitblit v1.9.3