From b977bf61c82b7dc39079974d7316b7a80cf520fa Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 02 九月 2024 09:36:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java b/src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java
index 992e750..951aa12 100644
--- a/src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java
@@ -19,5 +19,5 @@
 
     PartnerDTO getCurrentPartner(@Param("userId")String userId);
 
-    Partner getByIdOrUserId(@Param("partnerUserId") String partnerUserId);
+    List<Partner> getByIdOrUserId(@Param("partnerUserId") String partnerUserId);
 }

--
Gitblit v1.9.3