Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -148,7 +148,7 @@ class VideoTask extends Command
                 ],
                 ],
                 'task_id' => $task_id,
                 'task_id' => $task_id,
                 'callback_url' => env('APP_URL') . '/api/video_task_callback',
                 'callback_url' => env('APP_URL') . '/api/video_task_callback',
-                'is_ytb'=>false //:todo
+                'is_ytb'=>false
             ];
             ];
             $result = Http::post('http://216.250.255.116:7866/create_task', $data);
             $result = Http::post('http://216.250.255.116:7866/create_task', $data);
             $res_json = json_decode($result,true);
             $res_json = json_decode($result,true);

@@ -34,6 +34,7 @@ class CategoryController extends BaseController
     {
     {
         $this->map = $this->searchParam();
         $this->map = $this->searchParam();
         $filed = ['id', 'project_id', 'pid', 'title', 'image', 'route','keywords', 'describe', 'status','created_at','sort'];
         $filed = ['id', 'project_id', 'pid', 'title', 'image', 'route','keywords', 'describe', 'status','created_at','sort'];
+        $this->map['deleted_at'] = null;
         $list = $category->list($this->map,['sort','id'],$filed);
         $list = $category->list($this->map,['sort','id'],$filed);
         $data = [];
         $data = [];
         if(!empty($list)){
         if(!empty($list)){