合并分支 'lyh-server' 到 'master'

列表页聚合页模式



查看合并请求 !2461

@@ -40,7 +40,7 @@ class CategoryController extends BaseController
     public function index()
     public function index()
     {
     {
         $this->map = $this->searchParam();
         $this->map = $this->searchParam();
-        $filed = ['id', 'project_id', 'pid', 'title', 'image', 'route', 'status','created_at','sort'];
+        $filed = ['id', 'project_id', 'pid', 'title', 'image', 'route', 'status','created_at','sort','is_type'];
         $this->map['deleted_at'] = null;
         $this->map['deleted_at'] = null;
         if($this->user['project_id'] == 3283){//分类太多加载失败
         if($this->user['project_id'] == 3283){//分类太多加载失败
             $list = $this->get3283Lists($filed);
             $list = $this->get3283Lists($filed);