Merge remote-tracking branch 'origin/master'

mitao

2024-06-03 a6508a543e3727eb527db5feec9ac7155e88f599

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

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

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

import java.util.List;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.forepart.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.PromotionWishList;

/**
 * <p>