修改parent.pom
Merge branch 'master' of https://github.com/sin90lzc/my_mavens

Conflicts:
	parent-pom/pom.xml