--no commit message

@@ -140,11 +140,7 @@
        */
       singleElection (row) {
         this.selected = this.data.indexOf(row);
-<<<<<<< HEAD
-        this.$emit('row-click', row)
-=======
         // this.$emit('row-click', row)
->>>>>>> dev
       },
 
       /**

@@ -2,11 +2,7 @@
 /*
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Autor: renchao
-<<<<<<< HEAD
- * @LastEditTime: 2023-06-20 10:24:00
-=======
  * @LastEditTime: 2023-07-21 10:30:53
->>>>>>> dev
  */
 import axios from 'axios'
 import Router from '@/router'

 <!--
  * @Description:
  * @Autor: renchao
-<<<<<<< HEAD
- * @LastEditTime: 2023-06-16 09:47:53
-=======
  * @LastEditTime: 2023-07-17 13:18:17
->>>>>>> dev
 -->
 <template>
   <div class="from-clues">