按命名规范修改变量名字
解决冲突
Merge pull request #19 from maoyu/master

按命名规则修改变量名称