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 = () => {