Merge branch 'mitao-dev'

mitao

2024-05-31 fc13d832e58e42e241aa827e930651a28ca357e1

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java

@@ -1,10 +1,9 @@
package com.ruoyi.promotion.service;

import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.pojo.CouponMember;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.CouponMember;

/**
 * <p>
@@ -16,6 +15,6 @@
 */
public interface ICouponMemberService extends IService<CouponMember> {

    List<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO);
    PageDTO<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO);

}