# Conflicts:
#	src/main/java/org/rcisoft/business/bcoursecode/dao/BCourseCodeRepository.java
#	src/main/java/org/rcisoft/business/bcoursecode/service/impl/BCourseCodeServiceImpl.java
#	src/main/java/org/rcisoft/business/bstudent/entity/BStudent.java