Merge remote-tracking branch 'origin/master-v4' into master-v4

陶杰

2024-12-11 b1bef8fac3c0553f87b7047673123b23b68daa49

 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);
//    Partner getByIdOrUserId(@Param("partnerUserId") String partnerUserId);
}