Merge pull request #1 from chengliangbuct/develop

Develop
Merge pull request #2 from chengliangbuct/develop

jar
test
Merge branch 'master' of https://github.com/chengliangbuct/gongyuan_test
Merge branch 'master' into develop