Merge branch 'master' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa into develop

app/Admin/Controllers/ArticleManagement/ArticleController.php

@@ -30,7 +30,7 @@ class ArticleController extends AdminController
         });
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'));
-        $grid->column('type', __('分类'))->using([1=>'健康科普',2=>'疫苗科普']);
+        $grid->column('type', __('分类'))->using([1=>'健康科普',2=>'疫苗科普',3=>'娱乐']);
         $grid->column('title', __('标题'))->limit(10,'...')->width(100);
 //        $grid->column('content', __('内容'))->limit(20,'...')->width(200);
         $states = [