Merge remote-tracking branch 'origin/master'

xuhy

2024-09-23 c0d5aea0dd238b1d7cb99fc630121c2bf38563ba

 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java

@@ -29,7 +29,7 @@
    * @return
    */
   @PostMapping("/wx/query/queryOrderInfo")
   R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId);
   R<NotifyV3PayDecodeRespBody> queryOrderInfo(@RequestParam("orderId") String orderId);
   
   
   /**