Merge remote-tracking branch 'origin/master'

puzhibing

2024-03-18 945561a655919045c3086f00d7d16dbc1d24c23f

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