修改日志级别
a
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/pom.xml
	server/src/main/resources/spring-config.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/pom.xml
	server/src/main/resources/spring-config.xml