From cfaf819cb87cec28fcc4341c560185ee3fb3baf6 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 21 八月 2025 19:22:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/config/wx/WxPayProperties.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/config/wx/WxPayProperties.java b/server/services/src/main/java/com/doumee/config/wx/WxPayProperties.java
index 08ba1cb..1605a27 100644
--- a/server/services/src/main/java/com/doumee/config/wx/WxPayProperties.java
+++ b/server/services/src/main/java/com/doumee/config/wx/WxPayProperties.java
@@ -38,7 +38,7 @@
     /**
      * 鏀粯API瀵嗛挜
      */
-    private String subMchKey;
+//    private String subMchKey;
 
     /**
      * 鏀粯鍥炶皟鍦板潃
@@ -62,6 +62,7 @@
     private String typeId;// gybike
     private String privateKeyPath ;
     private String privateCertPath;// gybike
+    private String pubKeyPath;//
 
 
     private String wechatSerialNumer;

--
Gitblit v1.9.3