发布1.2.0
准备下个迭代
解决mysql下大小写问题
Merge remote-tracking branch 'remote/master'

Conflicts:
	src/main/resources/application.properties