Merge branch 'beta' into HK

src/components/pages/teacherSource/dialog.vue

@@ -164,11 +164,7 @@ export default {
                 }else{
                     if(this.typea == 'b107f98f-1dc4-4ede-80b4-178ba22b6a59'){
                         return this.CourseTypeJson[tid].filter(e => {
-<<<<<<< HEAD
-                            return ['fd7fc4a9-e934-47d5-9edf-f478a59010f0','5143a350-b20f-4a07-9d19-5ad305fefaac' ].indexOf(e.id) != -1 
-=======
                             return ['fd7fc4a9-e934-47d5-9edf-f478a59010f0','5143a350-b20f-4a07-9d19-5ad305fefaac','3777ef66-96ff-4f08-8e6d-a7b6acc6c789'].indexOf(e.id) != -1 
->>>>>>> beta
                         })
                     }else if(this.typea == '3b12e8d9-866f-46bb-aa22-76cb3b7788b3'){
                         return this.CourseTypeJson[tid].filter(e => {

src/components/pages/teacherSource/index.vue

@@ -166,11 +166,7 @@ export default {
                 }else{
                     if(this.typea == 'b107f98f-1dc4-4ede-80b4-178ba22b6a59'){
                         return this.CourseTypeJson[tid].filter(e => {
-<<<<<<< HEAD
-                            return ['fd7fc4a9-e934-47d5-9edf-f478a59010f0','5143a350-b20f-4a07-9d19-5ad305fefaac' ].indexOf(e.id) != -1 
-=======
                             return ['fd7fc4a9-e934-47d5-9edf-f478a59010f0','5143a350-b20f-4a07-9d19-5ad305fefaac','3777ef66-96ff-4f08-8e6d-a7b6acc6c789'].indexOf(e.id) != -1 
->>>>>>> beta
                         })
                     }else if(this.typea == '3b12e8d9-866f-46bb-aa22-76cb3b7788b3'){
                         return this.CourseTypeJson[tid].filter(e => {