Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/teaching/backend/config/MyBatisPlusConfig.java
# src/main/java/com/teaching/backend/controller/favour/SeCourseFavourController.java
# src/main/java/com/teaching/backend/controller/favour/SeKnowFavourController.java
# src/main/java/com/teaching/backend/controller/favour/SeResourceFavourController.java
# src/main/java/com/teaching/backend/controller/thumb/SeCourseThumbController.java
# src/main/java/com/teaching/backend/controller/thumb/SeKnowThumbController.java
# src/main/java/com/teaching/backend/controller/thumb/SeResourceThumbController.java
# src/main/java/com/teaching/backend/mapper/favour/SeCourseFavourMapper.java
# src/main/java/com/teaching/backend/mapper/favour/SeKnowFavourMapper.java
# src/main/java/com/teaching/backend/mapper/favour/SeResourceFavourMapper.java
# src/main/java/com/teaching/backend/mapper/thumb/SeCourseThumbMapper.java
# src/main/java/com/teaching/backend/mapper/thumb/SeKnowThumbMapper.java
# src/main/java/com/teaching/backend/mapper/thumb/SeResourceThumbMapper.java
# src/main/java/com/teaching/backend/model/dto/favour/courseFavour/CourseFavourAddRequest.java
# src/main/java/com/teaching/backend/model/dto/favour/courseFavour/CourseFavourAllRequest.java
# src/main/java/com/teaching/backend/model/dto/favour/knowFavour/KnowFavourAddRequest.java
# src/main/java/com/teaching/backend/model/dto/favour/resourceFavour/ResourceFavourAddRequest.java
# src/main/java/com/teaching/backend/model/dto/thumb/coursethumb/CourseThumbAddRequest.java
# src/main/java/com/teaching/backend/model/dto/thumb/coursethumb/CourseThumbAllRequest.java
# src/main/java/com/teaching/backend/model/dto/thumb/knowthumb/KnowThumbAddRequest.java
# src/main/java/com/teaching/backend/model/dto/thumb/resourcethumb/ResourceThumbAddRequest.java
# src/main/java/com/teaching/backend/model/entity/favour/SeCourseFavour.java
# src/main/java/com/teaching/backend/model/entity/favour/SeKnowFavour.java
# src/main/java/com/teaching/backend/model/entity/favour/SeResourceFavour.java
# src/main/java/com/teaching/backend/model/entity/thumb/SeCourseThumb.java
# src/main/java/com/teaching/backend/model/entity/thumb/SeKnowThumb.java
# src/main/java/com/teaching/backend/model/entity/thumb/SeResourceThumb.java
# src/main/java/com/teaching/backend/service/favour/SeCourseFavourService.java
# src/main/java/com/teaching/backend/service/favour/SeKnowFavourService.java
# src/main/java/com/teaching/backend/service/favour/SeResourceFavourService.java
# src/main/java/com/teaching/backend/service/impl/favour/SeCourseFavourServiceImpl.java
# src/main/java/com/teaching/backend/service/impl/favour/SeKnowFavourServiceImpl.java
# src/main/java/com/teaching/backend/service/impl/favour/SeResourceFavourServiceImpl.java
# src/main/java/com/teaching/backend/service/impl/thumb/SeCourseThumbServiceImpl.java
# src/main/java/com/teaching/backend/service/impl/thumb/SeKnowThumbServiceImpl.java
# src/main/java/com/teaching/backend/service/impl/thumb/SeResourceThumbServiceImpl.java
# src/main/java/com/teaching/backend/service/thumb/SeCourseThumbService.java
# src/main/java/com/teaching/backend/service/thumb/SeKnowThumbService.java
# src/main/java/com/teaching/backend/service/thumb/SeResourceThumbService.java
# src/main/resources/mapper/SeCourseThumbMapper.xml
|