Merge pull request #78 from pengqin/dev

Dev
数据不全
Merge pull request #85 from hopesfish/dev

补全数据