Merge branch 'dev'
This commit is contained in:
@@ -147,7 +147,7 @@ class TopsNas extends BaseController
|
||||
'id',
|
||||
'pid',
|
||||
'name',
|
||||
'picture',
|
||||
'picture'
|
||||
])
|
||||
->where('isshow', '=', 1)
|
||||
->where('country_code', '=', $this->country_code)
|
||||
@@ -264,7 +264,6 @@ class TopsNas extends BaseController
|
||||
|
||||
return $this->fetch();
|
||||
}
|
||||
|
||||
// 根据分类获取文章
|
||||
private function getArticleByCategory($categorys, $limit = null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user