From 870688ad1780184c670971254289f715c7ac9ed8 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 26 Sep 2023 17:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=9D=E8=AF=81=E9=87=91?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
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, 2 deletions(-)

diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index 44af882f..8bf7c8ba 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -273,10 +273,8 @@ class Merchant extends BaseController
         if ($merchantTypeInfo['first_margin'] > 0) {
             if ($merchantInfo['first_margin_status']) {
                 $merchantInfo['margin'] = $merchantInfo['margin'];
-                $merchantInfo['unpaid_margin'] = $merchantInfo['margin'];
             } else {
                 $merchantInfo['margin'] = $merchantTypeInfo['first_margin'];
-                $merchantInfo['unpaid_margin'] = $merchantTypeInfo['margin'];
             }
         }
         return app('json')->success($merchantInfo);