本地测试修改
Merge branch 'master' of git@github.com:wangsr/JavaProSet.git

Conflicts:
	javademo/src/main/java/org/wsr/mvn/test.txt