From d050f8807a8b7d496458bf7ded1da52edd84335f Mon Sep 17 00:00:00 2001
From: Liuyujia <18050528999@163.com>
Date: Tue, 14 Feb 2023 09:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit-qualitycontrol/index.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/views/audit-qualitycontrol/index.vue b/src/views/audit-qualitycontrol/index.vue
index 94e9714..9e11163 100644
--- a/src/views/audit-qualitycontrol/index.vue
+++ b/src/views/audit-qualitycontrol/index.vue
@@ -51,15 +51,6 @@ export default {
       auditStatus: "", // 0 待审核  1 已审核
       listLoading: false,
       tableData: [
-<<<<<<< HEAD
-        {
-          "unionName": "合肥高新附院",
-          "unionId": "2",
-          "reportTime": "2023-02-09 10:27:22",
-          "unCheckNums": 7,
-          "checkNums": 0
-        }
-=======
         // {
         //   unionId: "2",
         //   unionName: "合肥高新附院",
@@ -67,7 +58,6 @@ export default {
         //   checkNums: 0,
         //   reportTime: "2022-12-09 09:12:35",
         // },
->>>>>>> remotes/origin/dev
       ],
     }
   },
-- 
2.22.0