From d7819bb819cd897d5933ac98bdec7e3ccc70846c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 10:55:24 +0800
Subject: [PATCH] fix: 冲突

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java |    2 ++
 1 files changed, 2 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 dc86c02..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
@@ -55,4 +55,6 @@
 
     @ApiModelProperty(value = "订单号")
     private String orderNo;
+
+    private String orderId;
 }

--
Gitblit v1.9.3