Merge branch 'ol_12_30' into online

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -177,7 +177,7 @@
         <div
           class="newBand"
           @click="delStudentBtn"
-          v-if="info.paymentStatus == 'NO' && titleForm.paymentType != 'SPAN_GROUP_CLASS_ADJUST'"
+          v-if="titleForm.paymentType != 'SPAN_GROUP_CLASS_ADJUST'"
           v-permission="'musicGroupPaymentCalenderDetail/batchDel'"
         >
           删除学员