Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-30 9bcc40d213a44498c46dae5e678e592b918b40b0

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

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

import com.ruoyi.promotion.domain.pojo.Coupon;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.promotion.domain.Coupon;

/**
 * <p>