From a9f49eed5a1056e3968764ba5668c008c679d34d Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 16 一月 2025 15:44:12 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SeckillActivityInfoService.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SeckillActivityInfoService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SeckillActivityInfoService.java index e99a6fa..fc4106a 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SeckillActivityInfoService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SeckillActivityInfoService.java @@ -1,5 +1,6 @@ package com.ruoyi.other.service; +import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.other.api.domain.Goods; import com.ruoyi.other.api.domain.SeckillActivityInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -18,7 +19,7 @@ */ public interface SeckillActivityInfoService extends IService<SeckillActivityInfo> { - List<SeckillActivityVO> listSeckillActivity(Goods goods); + TableDataInfo<SeckillActivityVO> listSeckillActivity(Goods goods); SeckillActivityDetailVO detail(Integer seckillActivityId, String latitude, String longitude); -- Gitblit v1.7.1