From f5781289aaedc8460437154e179d85652995e7b8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 00:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java
index 280e9ae..8bd3b0f 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java
@@ -30,7 +30,7 @@
 		Map<String,String> headerMap = new HashMap<String,String>();
 		MessageBody body = new MessageBody();
 		headerMap.put("msgId", UUIDUtil.getRandomCode());
-		headerMap.put("merchNo", "B00000871");
+		headerMap.put("merchNo", zhengLianConfig.getMerchNo());
 		headerMap.put("txCode", "ZLPAY.ACC.T0001");
 		headerMap.put("version", "1.0.1");
 		headerMap.put("signa", "1");

--
Gitblit v1.7.1