From 2585d6876ad025bb24634f729b4196d52f77744b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 17 八月 2024 17:29:56 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/CouponClient.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/CouponClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/CouponClient.java
index 7d9affe..c4ede7f 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/CouponClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/CouponClient.java
@@ -22,6 +22,6 @@
 	 * @param id
 	 * @return
 	 */
-	@PostMapping("/t-coupon/getCouponById/{id}")
-	R<TCoupon> getCouponById(@PathVariable("id") Integer id);
+	@PostMapping("/t-coupon/getCouponById1/{id}")
+	R<TCoupon> getCouponById1(@PathVariable("id") Integer id);
 }

--
Gitblit v1.7.1