Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-24 d0e96daddf8d06900c468ee71a8ee4f14fc1c980

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

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