Merge remote-tracking branch 'origin/master'

xuhy

2024-10-23 8bce927ce49c6cf9c7dd625e96571e83262d9e71

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java

@@ -20,7 +20,7 @@
 */
public interface TAppCouponMapper extends BaseMapper<TAppCoupon> {

    List<ExchangeRecordVO> pageList(@Param("pageInfo")PageInfo<ExchangeRecordVO> pageInfo,@Param("req") ExchangeRecordGoodsQuery dto);
    List<ExchangeRecordVO> pageList(@Param("req") ExchangeRecordGoodsQuery dto);

    List<CouponListVOVO> couponList(@Param("pageInfo")PageInfo<CouponListVOVO> pageInfo,@Param("userId") Long userId);