Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-14 e38dbee7e43f6af65c7e9307d936a1c48e4bb539

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