From 0961a8595a8b8a3db70b7dd0608d630637458bee Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 20:39:15 +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