update：代码提交

src/modules/finance/payment/components/Order.vue

@@ -22,28 +22,8 @@
 
 <script>
 export default {
-=======
-  <app-card title="订单信息">
-    <table>
-      <tr>
-        <th>标题</th>
-        <td>{{title}}</td>
-      </tr>
-      <tr>
-        <th></th>
-        <td></td>
-      </tr>
-    </table>
-  </app-card>
-</template>
-
-<script>
-// 组件
-import AppCard from '@/components/base/AppCard.vue'
-export default {
-  components: { AppCard }
->>>>>>> master
 }
+
 </script>
 
 <style></style>

src/modules/finance/payment/components/Student.vue

 <template>
-<<<<<<< HEAD
   <div>
           <table border="1"  width="1200px" cellspacing="0">
               <tr>
@@ -31,17 +30,3 @@ export default {
 <style>
 
 </style>
-=======
-  <app-card title="学员信息"></app-card>
-</template>
-
-<script>
-// 组件
-import AppCard from '@/components/base/AppCard.vue'
-export default {
-  components: { AppCard }
-}
-</script>
-
-<style></style>
->>>>>>> master

src/modules/finance/payment/views/List.vue

 <template>
   <app-card>
-<<<<<<< HEAD
     <app-list
       v-bind="tableOptions"
       ref="list"
@@ -15,12 +14,9 @@
         ></el-switch>
       </template>
       <!-- 操作 -->
-=======
-    <app-list v-bind="tableOptions" ref="list" @selection-change="handleSelectionChange">
       <template #filter-date="{ params }">
         <el-date-picker v-model="params.date"></el-date-picker>
       </template>
->>>>>>> master
       <template v-slot:table-x="{ row }">
         <router-link :to="{ name: 'paymentView', params: { id: row.id } }">
           <el-button type="text">查看</el-button>