Merge pull request #92 from pengqin/dev

Dev
新方式
Merge remote-tracking branch 'origin/dev' into dev
更新数据
Merge pull request #105 from hopesfish/dev

dev