From de589b98ff007afdcec9d6cef5d1a2b168031b98 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 16 Jan 2021 16:12:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api

---
 zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
index 56216fc..705a50f 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
@@ -605,7 +605,7 @@
     /**
      * 微信商户号
      */
-    public static final String WECHARPAY_APPID = "wecharPayAppid";
+    public static final String WECHARPAY_MCHID = "wecharPayMchId";
     /**
      * 支付秘钥
      */

--
Gitblit v1.9.1