From 1ef145cb81b368999cd36a0ac58b467d041679fe Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 9 Mar 2024 14:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 2522acea..ffc7301d 100755
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -391,8 +391,9 @@ class Auth extends BaseController
             }else{
                 $data['mer_info'] =$mer_arr;
             }
-            $typCode = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'] ?? 0)->value('type_code');
-            $data['mer_info']['type_code'] = $typCode;
+            $merType = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'] ?? 0)->field('type_code,type_name')->find();
+            $data['mer_info']['type_code'] = $merType['type_code'];
+            $data['mer_info']['type_name'] = $merType['type_name'];
             $data['mer_info']['setting_status'] = 0;
             if (($mer_arr['update_time'] ?? '') > ($mer_arr['create_time'] ?? '')) {
                 $data['mer_info']['setting_status'] = 1;