Merge branch 'ol_12_30' into online

src/views/teamDetail/teamClassList.vue

@@ -138,7 +138,7 @@
                 @click="addCompound(scope.row)"
                 v-if="
                   scope.row.type != 'MUSIC_NETWORK' &&
-                  scope.row.type != 'HIGH_ONLINE' &&
+                  scope.row.type != 'HIGH_ONLINE' &&scope.row.type != 'HIGH'&&
                   !isAddCom(scope.row) &&
                   permission('classGroup/spanGroupMergeClassSplitClassAffirm')
                 "