Merge pull request #6 from zhangfanba/master

本地分支与ONE同步
测试github merge
Merge pull request #7 from qiuJinLong/master

测试github merge
test merge