20140804数据格式API定义
Merge branch 'master' of github.com:GzhuTeam116/TeamTest