Merge branch 'liuzj-permission-dev' into test

modules/Video/Http/Controllers/VideoController.php

@@ -40,7 +40,7 @@ class VideoController extends CatchController
             })->when($categoryId, function ($query, $categoryId){
                 return $query->where('category_id', $categoryId);
             })->orderBy('id', 'desc')
-            ->paginate($request->integer('per_page', 15));
+            ->paginate($request->integer('limit', 15));
         $userContext = $this->getUserContext($request->input('operateUserId'));
         $allVideoCategory =  DB::table('video_category')
             ->get()->keyBy('id');