Merge branch 'liuzj-permission-dev' into test

modules/Video/Http/Controllers/VideoCategoryController.php

@@ -20,13 +20,13 @@ class VideoCategoryController extends CatchController
         $data = [];
         foreach ($pCategory as $item) {
             $data[$item->id] = [
-                'channel_id' => $item->id,
-                'channel_name' => $item->category_name,
+                'value' => $item->id,
+                'label' => $item->category_name,
             ];
         }
         foreach ($videoCategorys->where('pid', '!=', 0)->all() as $item) {
             $data[$item->pid]['list'][] = [
-                'category_id' => $item->id, 'category_name' => $item->category_name,
+                'value' => $item->id, 'label' => $item->category_name,
             ];
         }