From 8c2a413d2574151a2bc762aa0779f766de48160b Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 18:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java
index a7bb861..30572bb 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java
@@ -15,6 +15,6 @@
  */
 public interface OrderGoodService extends IService<OrderGood> {
 
-    public List<OrderGood> getOrderListByUserIdAndGoodsId(Long userId, Long goodsId);
+    public List<OrderGood> getOrderListByUserIdAndGoodsId(Long userId, Integer goodsId);
 
 }

--
Gitblit v1.7.1