Merge branch '01/19NavMenu' into online

src/views/teamDetail/components/resetClass.vue

@@ -113,9 +113,10 @@
                 <el-button
                   type="text"
                   v-if="
-                    permission('classGroup/classGroupUpdate') ||
+                    scope.row.lockFlag != 1 &&
+                    (permission('classGroup/classGroupUpdate') ||
                     permission('classGroup/revisionClassGroup') ||
-                    permission('classGroup/revisionAddClassGroup')
+                    permission('classGroup/revisionAddClassGroup'))
                   "
                   @click="classAdjustment(scope.row)"
                   >排课</el-button