Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 d5bf846770b001cac64ca27a3fe2886a9c5076b3

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

@@ -63,7 +63,6 @@
    @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"})
    public R<TableDataInfo> list(Goods goods)
    {
        startPage();
        return R.ok(getDataTable(seckillActivityInfoService.listSeckillActivity(goods)));
    }