Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-13 ad60d3e63bbfe66abc4a4857099baeb1b668ff96

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

@@ -25,5 +25,5 @@

    IPage<SeckillActivityVO> querySeckillActivity(@Param("page") Page<SeckillActivityVO> page,@Param("goods") Goods goods);

    SeckillActivityDetailVO selectDetail(Integer seckillActivityId);
    SeckillActivityDetailVO selectDetail(@Param("seckillActivityId") Integer seckillActivityId, @Param("vip") Integer vip);
}