冲突

2 years ago · bbe285ca06
1 changed files with 0 additions and 4 deletions
--- 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) {