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

@@ -36,7 +36,7 @@ class CategoryController extends BaseController
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
         $data = $logic->getInfo($this->param['id']);
         $data = $logic->getInfo($this->param['id']);
-        return $this->success(Arr::twoKeepKeys($data, ['id', 'project_id', 'pid', 'title', 'image', 'keywords', 'describe', 'status', 'route', 'url']));
+        return $this->success($data);
     }
     }
 
 
     public function save(CategoryRequest $request, CategoryLogic $logic)
     public function save(CategoryRequest $request, CategoryLogic $logic)