merge to 712fe6679

This commit is contained in:
caishi 2021-12-21 14:17:14 +08:00
parent 600cef8826
commit eae91a7f4f
1 changed files with 5 additions and 0 deletions

View File

@ -277,7 +277,12 @@ class Index extends Component {
const { current_user } = this.props;
const { projectsList , recommendList , languageList , languageId ,
<<<<<<< HEAD
isSpin, total, search, limit, page, typeList, CategoryList , category_id , recommendOriList } = this.state;
=======
isSpin, total, search, limit, page, typeList, categoryList ,
recommendOriList , CategoryList , category_id } = this.state;
>>>>>>> 721fe6679 (explore/all 筛选)
const setting={
dots: true,