From d390d8f502436eaa17ee8ca7abd3c3f8a11a8514 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 13:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/dto/request/payment/OrderSettlementQueryDTO.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/request/payment/OrderSettlementQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/OrderSettlementQueryDTO.java
index 726c83a..49f0dd0 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/OrderSettlementQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/OrderSettlementQueryDTO.java
@@ -29,4 +29,7 @@
     @ApiModelProperty(hidden = true)
     private String userId;
 
+    @ApiModelProperty(value = "结算对象名称")
+    private String userName;
+
 }

--
Gitblit v1.9.3