From eda17104f25a0469c84a663c484e14628a3917cb Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 5 Sep 2023 16:37:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E6=88=B7=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8Bcode?=
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 0be883de..f499306a 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -246,7 +246,7 @@ class Merchant extends BaseController
         $delivery = $repository->get($id) + systemConfig(['tx_map_key']);
         $data = array_merge($data,$delivery);
         $data['sys_bases_status'] = systemConfig('sys_bases_status') === '0' ? 0 : 1;
-
+        $data['type_code'] = Db::name('MerchantType')->where('mer_type_id', $data['type_id'])->value('type_code');
         return app('json')->success($data);
     }