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

cloudroam

2024-11-08 49cff94025cefaf5bdb2db9bdee55b682b9e7390

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