Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-27 64a71565792d4f2e9fd31eab6e98e972c12daa86

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SeckillActivityInfoMapper.java

@@ -1,7 +1,12 @@
package com.ruoyi.other.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.api.domain.SeckillActivityInfo;
import com.ruoyi.other.vo.SeckillActivityDetailVO;
import com.ruoyi.other.vo.SeckillActivityVO;

import java.util.List;

/**
 * <p>
@@ -13,4 +18,7 @@
 */
public interface SeckillActivityInfoMapper extends BaseMapper<SeckillActivityInfo> {

    List<SeckillActivityVO> listSeckillActivity(Goods goods);

    SeckillActivityDetailVO selectDetail(Integer seckillActivityId);
}