简化组织机构
Merge remote-tracking branch 'remote/master'

Conflicts:
	pom.xml
	src/main/resources/application.properties