From a0a29587681bed434199487a1912940229f71385 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 10:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java | 2 +-
1 files changed, 1 insertions(+), 1 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 3d2b3e2..59f4ee2 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
@@ -21,7 +21,7 @@
PageInfo<GoodsVO> goodsList(Goods goods);
- GoodsVO goodsDetail(Long goodsId, String longitude, String latitude);
+ GoodsVO goodsDetail(Long goodsId, Integer shopId, String longitude, String latitude);
List<Goods> getGoodsListByShopId(PageInfo<Goods> pageInfo, Integer shopId);
--
Gitblit v1.7.1