Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-13 0961a8595a8b8a3db70b7dd0608d630637458bee

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SeckillActivityInfoService.java

@@ -20,7 +20,7 @@

    List<SeckillActivityVO> listSeckillActivity(Goods goods);

    SeckillActivityDetailVO detail(Integer seckillActivityId);
    SeckillActivityDetailVO detail(Integer seckillActivityId, String latitude, String longitude);

    void saveSeckillActivityInfo(SeckillActivityInfo seckillActivityInfo);