From 2585d6876ad025bb24634f729b4196d52f77744b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 17 八月 2024 17:29:56 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
index f36cca6..eede80e 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -117,6 +117,7 @@
return AjaxResult.ok(tCouponService.pageList(dto));
}
+
/**
* 小程序远程调用 获取优惠券信息
*/
@@ -136,8 +137,8 @@
* @param id
* @return
*/
- @PostMapping(value = "/getCouponById/{id}")
- public R<TCoupon> getCouponById(@PathVariable Integer id){
+ @PostMapping(value = "/getCouponById1/{id}")
+ public R<TCoupon> getCouponById1(@PathVariable(value = "id") Integer id){
TCoupon coupon = tCouponService.getById(id);
return R.ok(coupon);
}
--
Gitblit v1.7.1