新数据库修改entity, Mapper等
Merge branch 'master' of git@github.com:yuelaotou/wsun.git

Conflicts:
	src/main/resources/mybatis/generatorConfiguration.xml