Merge remote-tracking branch 'origin/master'

mitao

2024-06-19 d4f159d60acf6f263bfa4508a113c0feacd2f5b9

 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;