Merge branch 'liuzj-permission-dev' into test

modules/Video/Http/Controllers/VideoCategoryController.php

@@ -25,7 +25,7 @@ class VideoCategoryController extends CatchController
             ];
         }
         foreach ($videoCategorys->where('pid', '!=', 0)->all() as $item) {
-            $data[$item->pid]['list'][] = [
+            $data[$item->pid]['children'][] = [
                 'value' => $item->id, 'label' => $item->category_name,
             ];
         }