Merge branch 'liuzj-permission-dev' into test

modules/Video/Http/Controllers/VideoController.php

@@ -63,7 +63,7 @@ class VideoController extends CatchController
     public function setChargeConfig(Request $request) {
         $this->validate($request, [
             'id' => 'required',
-            'chargeCoin' => 'required|integer|min:50|max:250',
+            'chargeCoin' => 'required|integer|min:50|max:300',
             'chargeType' => 'required|integer|in:1',
             'chargeSequence' => 'required|integer|min:1|max:30'
         ]);