本地初始化提交
Merge branch 'master' of https://github.com/shsoftware/jjb.git

Conflicts:
	pom.xml
文件修正