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

# Conflicts:
#	接口文档.txt

接口文档.txt

@@ -4,4 +4,4 @@
    CourseList         int categoryId  HashSet<ESCourse>    课程分类查询所有    Post     /EsCourse/CourseList
    SelCourse          String name     HashSet<ESCourse>     课程的搜索        Post     /EsCourse/SelCourse
    checkAndCreateIndex  无              boolean           ES索引结构初始化     Get      /EsCourse/checkAndCreateIndex
-   1231231
+   123123412342134323143214123