diff --git a/gold-system/src/views/managerecharge/activity.vue b/gold-system/src/views/managerecharge/activity.vue
index d0c11d8..aa48821 100644
--- a/gold-system/src/views/managerecharge/activity.vue
+++ b/gold-system/src/views/managerecharge/activity.vue
@@ -173,7 +173,6 @@ const throttledAdd = async () => {
     ElMessage.error('新增活动失败')
   }
 }
-<<<<<<< HEAD
 
 // 删除确认方法
 const delConfirm = async (row) => {
@@ -199,8 +198,6 @@ const delConfirm = async (row) => {
 const del = (row) => {
   delObj.value = row
 }
-=======
->>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3
 </script>
 
 <template>