fix: 合并
This commit is contained in:
parent
c7035d14ef
commit
d19a084319
@ -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()
|
public function getHomeSchoolCategoryList()
|
||||||
{
|
{
|
||||||
$query = ModelSchoolCategory::field([
|
$query = ModelSchoolCategory::field([
|
||||||
'school_category_id',
|
|
||||||
'school_category_title',
|
|
||||||
'school_category_name',
|
'school_category_name',
|
||||||
'school_category_img',
|
'school_category_icon',
|
||||||
'school_category_total',
|
'school_category_total',
|
||||||
])
|
])
|
||||||
->where('school_category_status', 2)
|
->where('school_category_status', 2)
|
||||||
@ -180,6 +180,7 @@ class Home extends BaseController
|
|||||||
'a.teacher_name',
|
'a.teacher_name',
|
||||||
'a.teacher_position',
|
'a.teacher_position',
|
||||||
'a.teacher_img',
|
'a.teacher_img',
|
||||||
|
'a.teacher_intro',
|
||||||
'a.subject_guid',
|
'a.subject_guid',
|
||||||
'b.subject_name',
|
'b.subject_name',
|
||||||
'a.teacher_order'
|
'a.teacher_order'
|
||||||
|
Loading…
Reference in New Issue
Block a user