Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-24 75ec232b4f96ddb3bf59482adb7ad26e573cd9b6

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