From f33d0e80c8ea3fb35f35a732e70be3779764f656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 25 Mar 2022 11:08:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/app.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index 5674388d4..2d9875bda 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -188,8 +188,8 @@ dadaSourceID    = "73753"
 
 fnAppID = "6705486294797503379"
 fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e"
-fnMerchantId = "DDSdQhSc02m6l4oPVDELgx"
-fnCode = "5375691"
+fnCode = "DDSdQhSc02m6l4oPVDELgx"
+fnMerchantId= "5375691"
 fnCallbackURL = "http://callback.jxc4.com/fn/msg"
 
 weixinAppID  = "wxbf235770edaabc5c"
@@ -305,8 +305,8 @@ pushMasterSecret= "dGZcR0XGGg7H5Pd7FR3n47"
 
 fnAppID = "6705486294797503379"
 fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e"
-fnMerchantId = "51658"
 fnCode = "DDSdQhSc02m6l4oPVDELgx"
+fnMerchantId= "5375691"
 fnCallbackURL = "http://callback.jxc4.com/fn/msg"
 
 jxPrintAppID = "1000"
@@ -571,8 +571,8 @@ pushMasterSecret= "dGZcR0XGGg7H5Pd7FR3n47"
 
 fnAppID = "6705486294797503379"
 fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e"
-fnMerchantId = "DDSdQhSc02m6l4oPVDELgx"
-fnCode = "5375691"
+fnCode = "DDSdQhSc02m6l4oPVDELgx"
+fnMerchantId= "5375691"
 fnCallbackURL = "http://callback.jxc4.com/fn/msg"
 
 jxPrintAppID = "1000"