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

陶杰

2024-12-06 984c102eb4e632985e45b7c4be1545c53c87b589

 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);
}