likangbao commit
merge kinggate and likangbao
Merge branch 'master' of https://github.com/kinggate/TestGit