From 0d864c9bf892fd7c56600e197072e07c57847b34 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 02 九月 2024 14:07:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' 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 951aa12..d3a5eeb 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);
 
-    List<Partner> getByIdOrUserId(@Param("partnerUserId") String partnerUserId);
+//    Partner getByIdOrUserId(@Param("partnerUserId") String partnerUserId);
 }

--
Gitblit v1.9.3