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

huliguo

2025-07-31 b646898adf3f2ad119dd9fd1c7c01d7f0742bf97

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java

@@ -1535,8 +1535,8 @@
    }

    @Override
    public List<LotteryEventCouponListVO> getLotteryEventCouponList() {
        return this.getBaseMapper().getLotteryEventCouponList();
    public List<LotteryEventCouponListVO> getLotteryEventCouponList(Long shopId) {
        return this.getBaseMapper().getLotteryEventCouponList(shopId);
    }

    @Override