Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-07-25 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberCouponMapper.java

@@ -86,5 +86,5 @@
     * @param shopId
     * @return  void
     */
    void sureMemberCoupon(@Param("memberCouponId")String memberCouponId,@Param("shopId")Long shopId);
    void sureMemberCoupon(@Param("memberCouponId")Long memberCouponId,@Param("shopId")Long shopId);
}