From 6c422ce41ee40ed0be926c19cbdc2605816751ef Mon Sep 17 00:00:00 2001
From: guojia <445241500@qq.com>
Date: Sun, 5 May 2024 18:42:27 +0800
Subject: [PATCH] 1

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

diff --git a/app/api/controller/Controller.php b/app/api/controller/Controller.php
index 62f06486..277a53b9 100644
--- a/app/api/controller/Controller.php
+++ b/app/api/controller/Controller.php
@@ -75,10 +75,9 @@ class Controller extends BaseController
      */
     protected function getMerchantId()
     {
-        $user = UserService::getCurrentLoginUser(true);
-        if (!empty($user)) {
+/*        if (!empty($user)) {
             $this->merchantId = $user['user_name'];
-        }
+        }*/
     }
 
     /**