Merge branch 'feature/mzl_dev'

# Conflicts:
#	app/command/TbCommand.php
#	app/common/utils/email/Emails.php
#	app/controller/IndexController.php
#	app/functions.php
This commit is contained in:
mzl
2025-08-04 18:11:44 +08:00
parent be212317eb
commit a315ad33f1
8 changed files with 408 additions and 5 deletions
+1 -1
View File
@@ -93,7 +93,7 @@ class AuthLogic
->orWhere('email', $email);
})
->first();
$user->isLogin = true;
if (!$user) {
// 获取编号
$userSn = $this->getAvailableUserSn();