fix: 合并

app/api/controller/Home/Home.php

@@ -71,6 +71,7 @@ class Home extends BaseController
     }
 
 
+
     /**
      * 获取资讯文章列表
      */
@@ -97,6 +98,7 @@ class Home extends BaseController
     }
 
 
+
     /**
      * 获取首页环境列表
      */
@@ -118,10 +120,8 @@ class Home extends BaseController
     public function getHomeSchoolCategoryList()
     {
         $query = ModelSchoolCategory::field([
-            'school_category_id',
-            'school_category_title',
             'school_category_name',
-            'school_category_img',
+            'school_category_icon',
             'school_category_total',
         ])
             ->where('school_category_status', 2)
@@ -180,6 +180,7 @@ class Home extends BaseController
             'a.teacher_name',
             'a.teacher_position',
             'a.teacher_img',
+            'a.teacher_intro',
             'a.subject_guid',
             'b.subject_name',
             'a.teacher_order'