Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-13 e8d2134c739ebd98da8c91599a1339b677f975f6

 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);