Merge remote-tracking branch 'origin/master-v3' into master-v2

gongzuming

2024-10-14 58a8acceb63d52377da4b837e859f2e03d2bce1b

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