解决冲突

src/components/ImageEd.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-09 09:28:46
-<<<<<<< HEAD
- * @LastEditTime: 2021-12-08 15:11:05
-=======
- * @LastEditTime: 2021-12-07 15:15:25
->>>>>>> 478898aabba060765dd1630aa473f45aa7e53484
+ * @LastEditTime: 2021-12-08 16:23:37
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
@@ -735,16 +731,12 @@ export default {
       delMsg: '',
       // 删除的时间
       delTime: '',
-<<<<<<< HEAD
       //目标删除标志
       targetIsDelete: false,
       //目标删除时间
       targetDelTime: '',
-
-=======
       // 路由name
       routeName: ''
->>>>>>> 478898aabba060765dd1630aa473f45aa7e53484
     };
   },
   components: {