Merge branch 'liuzj-permission-dev' into test

modules/Video/Http/Controllers/EpisodeController.php

@@ -33,7 +33,7 @@ class EpisodeController extends CatchController
                 'is_enabled' => 1
             ])->select('series_name', 'series_sequence', 'video_url', 'duration')
             ->orderBy('series_sequence', 'asc')
-            ->paginate($request->integer('per_page', 15));
+            ->paginate($request->integer('limit', 15));
         foreach ($videoSeries as $series) {
             $series->series_name = sprintf('第%s集', $series->series_sequence);
             $series->is_charge = $series->series_sequence >= $video->charge_sequence;