From bbe285ca06a9c11abea2c129702be7d570f4d280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Sun, 28 Apr 2024 10:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiExpand/editExpand.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/components/resiExpand/editExpand.vue b/src/views/components/resiExpand/editExpand.vue
index 700885990..af51e23ea 100644
--- a/src/views/components/resiExpand/editExpand.vue
+++ b/src/views/components/resiExpand/editExpand.vue
@@ -310,11 +310,7 @@ export default {
         },
         async getOrgTree() {
             try {
-<<<<<<< HEAD
-                const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select', { partyOrgId:this.partyOrgIdPath,depth:8 })
-=======
                 const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select',{depth: 8})
->>>>>>> a2b508a3f69e44b53fe8aee2fbf58c566b839abc
                 this.formList.forEach(c => {
                     if (c.formId == "parymemberInfoDto") {
                         for (let i of c.form[0].children) {