Merge remote-tracking branch 'origin/master' into develop

@@ -29,7 +29,7 @@ class BaseController extends Controller
     protected $uid = 0;
     protected $uid = 0;
     protected $user = [];//当前登录用户详情
     protected $user = [];//当前登录用户详情
     /**
     /**
-     * 获取所有参数
+     * ceshi获取所有参数
      */
      */
     public function __construct(Request $request)
     public function __construct(Request $request)
     {
     {