# Conflicts: # src/main/java/com/sqx/SqxApplication.java # src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java # src/main/resources/mapper/course/CourseDao.xml
# Conflicts: # src/main/java/com/sqx/SqxApplication.java # src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java # src/main/resources/mapper/course/CourseDao.xml