Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

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

@@ -3,11 +3,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.forepart.vo.CouponMemberVO;
import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
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>
@@ -30,4 +29,5 @@

    List<CouponMemberVO> updCouponMember1(@RequestBody CouponMemberDTO couponMemberDTO);

    void timingCheckMemberCoupon();
}