From 322d7a800b893832c8aedd405bda38a3744ee12a Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 28 Dec 2023 18:31:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8A=BC=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index cbbcb097..4bea5cf4 100755
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -310,7 +310,7 @@ class Merchant extends BaseController
 
     public function apply($merId)
     {
-        $merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type')->find();
+        $merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type,ot_margin')->find();
         if (($msg = $this->checkAuth($merchant)) !== true) {
             return app('json')->fail($msg);
         }
@@ -334,6 +334,8 @@ class Merchant extends BaseController
             'financial_bank_code' => $merchant->financial_bank->bank_code ?? '', //银行卡信息
             'financial_bank_branch' => $merchant->financial_bank->bank_branch ?? '', //开户行
             'financial_type' => $merchant->financial_type, //提现方式
+            'ot_margin' => $merchant->ot_margin, //提现方式
+
         ];
         return app('json')->success($data);
     }