Merge branch 'hotfix-8' into develop

app/Http/Middleware/CheckRoleChangeMiddleware.php

@@ -15,7 +15,7 @@ class CheckRoleChangeMiddleware
     public function handle($request, Closure $next)
     public function handle($request, Closure $next)
     {
     {
         $lastLoginType = auth('api')->user()->last_login_type;
         $lastLoginType = auth('api')->user()->last_login_type;
-        $requestLastLoginType = $request->headers->get('last_login_type', 0);
+        $requestLastLoginType = $request->headers->get('last_login_type') ?: 0;
         if ($lastLoginType != $requestLastLoginType) {
         if ($lastLoginType != $requestLastLoginType) {
             return response()->json(['status' => false, 'code' => 600, 'message' => '您的角色切换错误~', 'data' => []]);
             return response()->json(['status' => false, 'code' => 600, 'message' => '您的角色切换错误~', 'data' => []]);
         }
         }