# Conflicts:
#	src/main/java/org/rcisoft/business/bstudent/service/impl/BStudentServiceImpl.java
#	src/main/java/org/rcisoft/business/bteacher/dao/BTeacherRepository.java
#	src/main/java/org/rcisoft/business/bteacher/service/impl/BTeacherServiceImpl.java
#	src/main/java/org/rcisoft/core/security/JwtAuthenTokenFilter.java