From cbcb2f5683ae64cd567b3865749edaeed9d3c0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Thu, 24 Aug 2023 09:05:34 +0800
Subject: [PATCH] 1

---
 src/views/privateOrder/security/components/componentRight.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/privateOrder/security/components/componentRight.vue b/src/views/privateOrder/security/components/componentRight.vue
index 65c8a37..98236c9 100644
--- a/src/views/privateOrder/security/components/componentRight.vue
+++ b/src/views/privateOrder/security/components/componentRight.vue
@@ -232,11 +232,7 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import { safeRisks } from "@/api/wlSafe";
-=======
 import {safeRisks,tbFinish} from '@/api/wlSafe'
->>>>>>> 2fc8ba4145509fb4617499e6b82e9046877addd8
 import { listDanger, getDanger, listTb, getTb } from "@/api/zongzhi/st.js";
 import vueSeamlessScroll from "vue-seamless-scroll";
 import ModuleTitle from "../../common/ModuleTitle.vue";