Merge pull request #96 from hopesfish/dev

Dev
1.user 增加email字段
2.改变上传接口的id名称
Merge pull request #86 from pengqin/dev

Dev