Merge branch 'master' into develop

# Conflicts: # app/common/logic/AuthLogic.php
2025-07-30 18:41:37 +08:00
parent 74d3e93fec
commit 8f4db9ed97
1 changed files with 1 additions and 1 deletions
@@ -93,7 +93,7 @@ class AuthLogic
                                ->orWhere('email', $email);
                        })
                        ->first();
-            $user->isLogin = true;;
+            $user->isLogin = true;
            if (!$user) {
                // 获取编号
                $userSn = $this->getAvailableUserSn();