合入基本的pom配置
asdf
Merge branch 'master' of https://github.com/wsbjx/Polaris

Conflicts:
	.gitignore
asdf