修改冲突

puzhibing

2024-08-17 ffae18d7a8e21b93bc837d889504d2c8b55368c0

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ExchangeOrderClient.java

@@ -19,6 +19,6 @@


    @PostMapping(value = "/t-exchange-order/detail")
    R<TExchangeOrder> orderDetail(@RequestParam Long orderId);
    R<TExchangeOrder> orderDetail(@RequestParam("orderId") Long orderId);

}