配置信息修改
提交回滚
Merge branch 'master' of https://github.com/iacdingping/test

Conflicts:
	qsync-core/src/main/resources/application.development.properties
	qsync-core/src/main/resources/application.test.properties