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

huliguo

23 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 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;

}