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/mapper/coupon/CouponMapper.java

@@ -113,4 +113,12 @@
     * @return  List<AppGetAbleCouponPageVo>
     */
    List<AppGetAbleCouponPageVo> getAbleCouponPageVoList(Page page, @Param("shopId") Long shopId, @Param("userId") Long userId, @Param("memberFlag") Integer memberFlag, @Param("unGetList") List<String> unGetList);

    /**
     *
     * @return
     */
    List<LotteryEventCouponListVO> getLotteryEventCouponList(@Param("shopId") Long shopId);

    List<LotteryEventCouponListVO> getLotteryEventCouponListByShopId(@Param("shopId") String shopId);
}