同步修改
调整代码规范
Merge pull request #110 from 2betop/master

调整代码规范