merge测试
Merge pull request #7 from qiuJinLong/master

测试github merge
test merge
Merge pull request #8 from zhangfanba/master

merge测试
Merge pull request #1 from One-Platform/master

与ONE同步