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:
@@ -93,7 +93,7 @@ class AuthLogic
|
||||
->orWhere('email', $email);
|
||||
})
|
||||
->first();
|
||||
|
||||
$user->isLogin = true;
|
||||
if (!$user) {
|
||||
// 获取编号
|
||||
$userSn = $this->getAvailableUserSn();
|
||||
|
||||
Reference in New Issue
Block a user