From 8f3dea51fbca4aa40b9353bd009eb01c3322a572 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 9 Nov 2023 17:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=BB=E7=BB=93=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/Merchant.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index 7689f7c2..8097dc02 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -318,7 +318,8 @@ class Merchant extends BaseController
             'mer_id' => $merchant->mer_id,//商户id
             'mer_name' => $merchant->mer_name,//商户名称
             'mer_money' => $merchant->mer_money,//商户余额
-            'lock_money' => $merLockMoney,//商户余额
+            'lock_money' => $merLockMoney,//冻结金额
+            'lock_time' =>  systemConfig('mer_lock_time'),//冻结金额
             'extract_minimum_line' => $extract_minimum_line,//提现最低额度
             'extract_minimum_num' => $extract_minimum_num,//提现最低次数
             'extract_money' => $_extract,//可提现金额