Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-16 7ee0ca402600bb6c71af722603c5a3d4497044a6

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java

@@ -2,9 +2,7 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.api.feignClient.CouponClient;
import com.ruoyi.other.api.feignClient.GoodsClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -38,7 +36,7 @@
         
         @Override
         public R updateCoupon(TCoupon coupon) {
            throw new RuntimeException("修改优惠券失败");
            return R.fail("修改优惠券失败");
         }
      };
   }