修改了收藏的逻辑
Merge branch 'master' of https://github.com/tcmaster/OurProject