Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/protocol/WXPayReport.java

@@ -110,7 +110,7 @@
    }

    private static final String REPORT_URL = "http://report.mch.weixin.qq.com/wxpay/report/default";
    // private static final String REPORT_URL = "http://127.0.0.1:5000/test";
    // private static final String REPORT_URL = "http://192.168.110.188:5000/test";


    private static final int DEFAULT_CONNECT_TIMEOUT_MS = 6*1000;