Merge remote-tracking branch 'origin/master'

mitao

2024-06-05 e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a

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

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

import com.ruoyi.common.core.domain.R;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.bind.annotation.PathVariable;

import com.ruoyi.promotion.domain.PromotionBanner;
import java.util.List;

/**