Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-21 5c41048a7b55e5df92fc88996ef10e58cbf967d1

 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());
         }
      };