# Conflicts:
#	src/main/java/org/rcisoft/business/bchapter/dto/QueryChapterListResDTO.java
#	src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java
#	src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java
#	src/main/resources/mapper/business/bchapter/mapper/BChapterMapper.xml