From 51ebcb1c610a4a2fac892c5ea73ef856efdc9695 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 24 Sep 2023 22:45:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/controller/api/store/m?=
 =?UTF-8?q?erchant/Merchant.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改保证金
---
 app/controller/api/store/merchant/Merchant.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index 1bede8ae..882c4994 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -264,7 +264,7 @@ class Merchant extends BaseController
         if(empty($id)){
             return app('json')->fail('参数错误');
         }
-        $data = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,mer_name,margin,is_margin')->find();
+        $data = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,mer_name,recharge_margin,is_margin')->find();
         return app('json')->success($data);
     }