删除本地数据
Merge branch 'chende'
修改数据类型
Merge branch 'master' into chende