From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
index cf5c5bb..f29c8ce 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
@@ -2,11 +2,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
+import com.ruoyi.promotion.controller.forepart.vo.CouponMemberVO;
import com.ruoyi.system.api.domain.CouponMember;
-import org.springframework.web.bind.annotation.RequestBody;
-
+import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
import java.util.List;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -18,15 +18,16 @@
*/
public interface ICouponMemberService extends IService<CouponMember> {
- PageDTO<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO);
+ PageDTO<CouponMemberVO> getCouponMemberList(CouponMemberDTO couponMemberDTO);
CouponMember getCouponMember(@RequestBody CouponMemberDTO couponMemberDTO);
void updCouponMember(@RequestBody CouponMemberDTO couponMemberDTO);
- List<CouponMember> getCouponMemberl(@RequestBody CouponMemberDTO couponMemberDTO);
+ List<CouponMemberVO> getCouponMemberl(@RequestBody CouponMemberDTO couponMemberDTO);
- List<CouponMember> updCouponMember1(@RequestBody CouponMemberDTO couponMemberDTO);
+ List<CouponMemberVO> updCouponMember1(@RequestBody CouponMemberDTO couponMemberDTO);
+ void timingCheckMemberCoupon();
}
--
Gitblit v1.7.1