Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2025-06-18 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/config/WxPayProperties.java

@@ -41,4 +41,10 @@
   */
  private String keyPath;

  private String apiV3Key;

  private String privateKeyPath;

  private String privateCertPath;

}