Merge branch '01/06_classMerge' into online

src/views/resetTeaming/components/resetPayList.vue

@@ -138,6 +138,7 @@
 
               <el-button type="text"
                        v-permission="'musicGroupPaymentCalender/delByBatchNo'"
+                       v-if="scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'"
                        @click="removeBatchNo(scope.row)">删除</el-button>
 
               <!-- <el-button type="text"