Merge branch 'hotfix/login_lock' of wmtx/sdk into master

修改登录锁定bug

Application/Base/Service/UserService.class.php

@@ -98,7 +98,7 @@ class UserService
         $user = M('user', 'tab_')->where(['account' => $account])->find();
 
         /* 获取用户数据 */
-        if (empty($user) || $user['lock_status'] != 1  && $user['check_status'] != 1) {
+        if (empty($user) || $user['lock_status'] != 1  || $user['check_status'] != 1) {
             return ['status' => false, 'message' => '账号或密码错误'];
         }
         if ($this->password($password, UC_AUTH_KEY) !== $user['password']) {