From e0623f1a914ecbc99d5926c0df3cf26032c02499 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 01 一月 2025 17:11:50 +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/GoodsService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java
index db2c9b8..4d7accd 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.other.api.domain.Goods;
 import com.ruoyi.other.vo.GoodsVO;
 
@@ -18,11 +19,11 @@
  */
 public interface GoodsService extends IService<Goods> {
 
-    List<GoodsVO> goodsList(Goods goods);
+    PageInfo<GoodsVO> goodsList(Goods goods);
 
     GoodsVO goodsDetail(Long goodsId);
 
-    List<Goods> getGoodsListByShopId(Integer shopId);
+    List<Goods> getGoodsListByShopId(PageInfo<Goods> pageInfo, Integer shopId);
 
     void addGoods(Goods goods);
 

--
Gitblit v1.7.1