merge
merge
Merge pull request #9 from huahuajiujiu/master

fix the auto merge bugs
Merge pull request #10 from huahuajiujiu/master

edit diary
merge
Merge remote-tracking branch 'origin/master'
merge from local origin
关注/取消关注 前后端功能完成
Merge pull request #7 from TechZi/master

从yp分支同步代码