对mybatis mapper映射的属性类型和名称修改
Merge branch 'master' of https://github.com/haluomao/ClassificationInfoDemo

Conflicts:
	src/main/java/com/student/registration/service/impl/ClassListServiceImpl.java