Merge branch 'teacher' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into dev

# Conflicts:
#	.gitignore
#	src/components/Course/weikeContent.vue

src/api/modules/teacher.js

@@ -173,6 +173,17 @@ const end=function(id){
 const exports=function(query){
 	return ajax.post('/xboe/teacher/export',query);
 }
+
+/**
+ * courseType // 课程类型：‘1,2’:面授,训练班；‘0’：在线班
+ * sysId:教师的sysId
+ * tid： 教师的id
+ * @param {tid,sysId,countType,pageSize:100,pageIndex} query
+ */
+const findAllCourses=function(query){
+	return ajax.post('/xboe/teacher/compose/find/courses',query);
+}
+
 export default {
     findByName,
     getInfoById,