From b10c7ad25b2ee14d966c775cde9616d8f4b40217 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 9 Dec 2023 16:50:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=95=86=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=95=86=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/dataview/Login.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controller/api/dataview/Login.php b/app/controller/api/dataview/Login.php
index 7d9b0aa7..2cf657b2 100644
--- a/app/controller/api/dataview/Login.php
+++ b/app/controller/api/dataview/Login.php
@@ -56,6 +56,7 @@ class Login extends BaseController
             $msg = '账号或密码错误';
             throw new ValidateException($msg);
         }
+        $user['merchant'] = Db::name('merchant')->where('uid', $user['uid'])->find();
         $expire = time()+ 3600 * 24;
         $token = md5($expire);
         // 缓存token