收藏教师相关接口修改
Merge branch 'master' of https://github.com/wsjyz/manhattan

Conflicts:
	src/main/java/com/manhattan/dao/impl/ITeacherDetailDaoImpl.java
	src/main/java/com/manhattan/domain/TeacherDetail.java
	src/main/java/com/manhattan/domain/User.java