Merge remote-tracking branch 'origin/meiteng' into meiteng

src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java

@@ -229,7 +229,7 @@ public class BLessonController extends PaginationController<BLesson> {
                 gridModel);
     }
 
-    @ApiOperation(value="616 分页查询列表页全部", notes="分页查询列表页全部", response = BLesson.class)
+    @ApiOperation(value="616 列表页分页查询课程", notes="分页查询列表页全部", response = BLesson.class)
     @GetMapping(value = "/queryListAllLessonByPagination")
     public Result queryListAllLessonByPagination(CurUser curUser, @Valid FindListLessonDTO param, BindingResult bindingResult) {
         List<AllCourseDTO> allCourse = null;

src/main/java/org/rcisoft/business/blesson/dto/FindListLessonDTO.java

@@ -27,7 +27,7 @@ public class FindListLessonDTO {
     @ApiModelProperty(value = "课程类型 0 课程 1 培训")
     private String lessonType;
 
-    @ApiModelProperty(value = "查询类型 0 全部 1 推荐 2在学 3收藏",required = true)
+    @ApiModelProperty(value = "查询类型 0 全部 1 推荐 2在学 3收藏 4兴趣",required = true)
     private String searchType;
 
     private List<String> courseIds;