From 8f4db9ed9790c27426754ca0592f44b6b4fdd071 Mon Sep 17 00:00:00 2001 From: mzl Date: Wed, 30 Jul 2025 18:41:37 +0800 Subject: [PATCH] Merge branch 'master' into develop # Conflicts: # app/common/logic/AuthLogic.php --- app/common/logic/AuthLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/logic/AuthLogic.php b/app/common/logic/AuthLogic.php index 4211446..f0261ed 100644 --- a/app/common/logic/AuthLogic.php +++ b/app/common/logic/AuthLogic.php @@ -93,7 +93,7 @@ class AuthLogic ->orWhere('email', $email); }) ->first(); - $user->isLogin = true;; + $user->isLogin = true; if (!$user) { // 获取编号 $userSn = $this->getAvailableUserSn();