From db8e9eb6b3ddaa67c53ca37b7e57e20f511a6216 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Mon, 11 Mar 2024 10:45:28 +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 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index a6494276..20217f76 100755
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -395,9 +395,6 @@ class Auth extends BaseController
             $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;
-            }
         }
         $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);