From 29d54ab95bbff944e0c168f3998d65c1e24c4aed Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Wed, 6 Sep 2023 14:11:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index eb507b38..dae5adf9 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -211,9 +211,9 @@ class Auth extends BaseController
             if ($mer_arr && $mer_arr['mer_avatar'] != '' && $mer_arr['mer_banner'] != '' && $mer_arr['mer_info'] && $mer_arr['service_phone'] != '' && $mer_arr['mer_address'] != '') {
                 $data['is_wsxx'] = 1;
             }
-            $mer_arr['type_code'] = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'])->value('type_code');
-            $data['mer_info'] = $mer_arr;
         }
+        $typCode = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'])->value('type_code');
+        $data['mer_info']['type_code'] = $typCode;
         $data['fan_num']   = app()->make(RelevanceRepository::class)->getUserFans($user->uid, 1, 1, 1);
         $data['focus_num'] = app()->make(RelevanceRepository::class)->getUserFocus($user->uid, 1, 1, 1);
         $data['community_num'] = Db::name('community')->where('uid', $user->uid)->whereIn('is_type', '1,2')->count();