gx

@@ -35,15 +35,10 @@ class BaseController extends Controller
             $info = Cache::get($this->token);
             $info = Cache::get($this->token);
             $this->user = $info;
             $this->user = $info;
             $this->uid = $info['id'];
             $this->uid = $info['id'];
-<<<<<<< HEAD
             //参数处理
             //参数处理
             $this->get_param();
             $this->get_param();
             //日志记录
             //日志记录
             $this->set_user_log();
             $this->set_user_log();
-=======
-        }else{
-            throw new HttpResponseException(response(['code'=>Code::USER_ERROR,'msg'=>'当前用户未登录']));
->>>>>>> db84ec9e0ac005907f6868b371df2ccf8defd114
         }
         }
     }
     }