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

gongzuming

2024-09-10 6d6f3ecc111080094e91fd002e1990dcfa9783e6

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