Merge remote-tracking branch 'origin/master'

mitao

2024-06-05 e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a

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

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.forepart.dto.PromotionWishListDTO;
import com.ruoyi.system.api.domain.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.PromotionWishList;

/**