合并冲突
Merge branch 'master' of https://github.com/skmbw/ssm.git

Conflicts:
	ssm/mybatis-generator-config.xml