Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-31 9c6e78ea55ef4c865b8148a5ca47322504ed1f50

 src/main/java/com/mzl/flower/mapper/coupon/CouponTemplateMapperCustom.java

@@ -6,6 +6,7 @@
import com.mzl.flower.dto.request.coupon.QueryActivePointCouponDTO;
import com.mzl.flower.dto.request.coupon.QueryActivityEffectCouponDTO;
import com.mzl.flower.dto.request.coupon.QueryCouponDTO;
import com.mzl.flower.dto.response.coupon.CouponTemplateCustomerVO;
import com.mzl.flower.dto.response.coupon.CouponTemplateVO;
import com.mzl.flower.entity.coupon.CouponTemplateDO;
import org.apache.ibatis.annotations.Param;
@@ -49,4 +50,12 @@
    Page<CouponTemplateVO> getPointPage(Page page,@Param("param") QueryActivePointCouponDTO dto);

    List<CouponTemplateVO> getActivityEffectList(@Param("param") QueryActivityEffectCouponDTO dto);

    /**
     * 获取关联的用户信息
     * @param id
     * @return
     */
    List<CouponTemplateCustomerVO> getCouponCustomerList(@Param("id") String id);

}