From e5e2047a94558d8045702a9763adafa14254c929 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Mon, 12 Dec 2022 19:10:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=94=BF=E5=8A=A1=E4=BA=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/personalCenter/components/MyApply.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 384789be..cff47b7c 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -534,7 +534,6 @@
       name: yunForm.busineesName,
     }
     total.value = 5
-<<<<<<< HEAD
       getZwyBusinessList(params).then(
         (res) => {
        
@@ -543,13 +542,6 @@
           total.value = res.data.data.total
         }
       )
-=======
-    getZwyBusinessList(params).then((res) => {
-      cloudList.data = res.data.data.list
-      num.value = []
-      total.value = res.data.data.total
-    })
->>>>>>> 8906f1f60aad20082e68337c7c166c057237fdd1
   }
   //查询政务云状态
   const getCloudResource = () => {