From 866c74e61f369a1ef976b6b7d0c1c1c135a46a5a Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期六, 17 八月 2024 17:24:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java index f5821e7..452dadb 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java @@ -25,7 +25,7 @@ return new CouponClient() { @Override - public R<TCoupon> getCouponById(Integer id) { + public R<TCoupon> getCouponById1(Integer id) { return R.fail("根据id获取优惠券信息失败:" + throwable.getMessage()); } }; -- Gitblit v1.7.1