From e2dca5a3ce717a7708d432955d3dc8d6ee800e5d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 19:12:16 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java
index 56ad3e3..d370ac7 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java
@@ -37,7 +37,7 @@
}
@GetMapping("/getOrderListByUserIdAndGoodsId")
- public R<List<OrderGood>> getOrderListByUserIdAndGoodsId(Long userId, Long goodsId){
+ public R<List<OrderGood>> getOrderListByUserIdAndGoodsId(Long userId, Integer goodsId){
return R.ok(orderGoodService.getOrderListByUserIdAndGoodsId(userId, goodsId));
}
}
--
Gitblit v1.7.1