From 2bdbc6648cb4e340d057063324f46c2fce013544 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 23 十二月 2024 10:36:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsShopService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsShopService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsShopService.java
index fcad894..89fdf3c 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsShopService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsShopService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.other.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.other.api.domain.GoodsShop;
 import com.ruoyi.other.vo.ShopGoodsList;
 import com.ruoyi.other.vo.ShopGoodsListVo;
@@ -22,5 +23,5 @@
 	 * @param shopGoodsListVo
 	 * @return
 	 */
-	List<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo);
+	PageInfo<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo);
 }

--
Gitblit v1.7.1