其实没什么调整
too
新增MySQL支持
添加MySQL支持

添加MySQL支持
Merge branch 'master' of https://github.com/rong1005/template

Conflicts:
	target/classes/META-INF/persistence.xml
	target/classes/application.development.properties
	target/classes/application.properties
	target/classes/applicationContext.xml
	target/classes/log4jdbc.properties

	target/m2e-wtp/web-resources/META-INF/maven/com.cn/template/pom.properties
	target/m2e-wtp/web-resources/META-INF/maven/com.cn/template/pom.xml
	target/test-classes/application.test.properties