Merge branch 'develop' of 47.244.231.31:zhl/globalso-v6 into develop

@@ -3,18 +3,12 @@
 namespace App\Http\Controllers\Bside;
 namespace App\Http\Controllers\Bside;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
-use App\Helper\AyrShare as AyrShareHelper;
-use App\Helper\Country;
-use App\Models\AyrShare\AyrRelease as AyrReleaseModel;
-use App\Models\AyrShare\AyrShare as AyrShareModel;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Project\Project as ProjectModel;
 use App\Models\Project\Project as ProjectModel;
 use App\Models\SmsLog;
 use App\Models\SmsLog;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\User as UserModel;
 use App\Models\User\User as UserModel;
-use App\Models\User\User;
-use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
 use Mrgoon\AliSms\AliSms;
 use Mrgoon\AliSms\AliSms;
@@ -137,7 +131,7 @@ class ComController extends BaseController
             'mobile.regex' => '请输入正确的手机号码',
             'mobile.regex' => '请输入正确的手机号码',
         ]);
         ]);
         $mobile = $request->input('mobile');
         $mobile = $request->input('mobile');
-        $user = User::where(['mobile' => $mobile])->first();
+        $user = UserModel::where(['mobile' => $mobile])->first();
         if (empty($user)) {
         if (empty($user)) {
             return $this->response('请输入正确的手机号码！', Code::USER_LOGIN_ERROE);
             return $this->response('请输入正确的手机号码！', Code::USER_LOGIN_ERROE);
         }
         }