Merge remote-tracking branch 'origin/master'

xuhy

2024-08-17 5a5b01fa9824a42e3eb033088a20e24c32b30dda

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/CouponClient.java

@@ -6,6 +6,7 @@
import com.ruoyi.other.api.factory.CouponFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;

/**
@@ -21,6 +22,6 @@
    * @param id
    * @return
    */
   @PostMapping("/t-coupon/getCouponById")
   R<TCoupon> getCouponById(Integer id);
   @PostMapping("/t-coupon/getCouponById/{id}")
   R<TCoupon> getCouponById(@PathVariable("id") Integer id);
}