Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-27 e3bd1dab9944dd57ea699f5d7514b1b0b29e2bee

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java

@@ -142,7 +142,7 @@
                    System.err.println("----充电支付回调");
                    break;
            }

            wxV3Pay.ack();
            return R.ok(params);
        } catch (Exception e) {
            log.error("支付回调异常：{}", e, e);