Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-09 74b2581c8a9be309ca6454da3ff2c56501368771

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java

@@ -72,9 +72,9 @@
     */
    @GetMapping("/detail/{id}")
    @ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页"})
    public R<SeckillActivityDetailVO> detail(@PathVariable("id") Integer id)
    public R<SeckillActivityDetailVO> detail(@PathVariable("id") Integer id, String latitude, String longitude)
    {
        return R.ok(seckillActivityInfoService.detail(id));
        return R.ok(seckillActivityInfoService.detail(id, latitude, longitude));
    }