From 31fbdf581c7e5e7318d36905d2497e4110580e3b Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 4 Sep 2023 18:11:54 +0800
Subject: [PATCH] 00

---
 src/components/customerOrg/customerOrgTree.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue
index bb24be1..81da892 100644
--- a/src/components/customerOrg/customerOrgTree.vue
+++ b/src/components/customerOrg/customerOrgTree.vue
@@ -56,14 +56,7 @@ export default {
 
     //获取单位基本信息
     getCustomerOrgRd(id) {
-<<<<<<< HEAD
       this.customerOrg.customerOrgRd.id = id;      
-=======
-      getapi(`/api/app/customer-org/${id}`).then((res) => {
-        //console.log("res.data", res.data);
-        this.customerOrg.customerOrgRd = res.data;
-      });
->>>>>>> eb9e7b4dc4afd96efe09f14672e77f7013cd7370
     },
 
     //获取体检次数列表