initial commit
重复提交
Merge remote-tracking branch 'origin/master'
将父项目的java配置去掉