From aca98aa79194ad0835167be1cc7ce3df516b564b Mon Sep 17 00:00:00 2001 From: zry <18990852002@163.com> Date: Mon, 28 Apr 2025 14:24:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B4=BB=E5=8A=A8=E7=9A=84?= =?UTF-8?q?=E8=AD=A6=E5=91=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/src/views/managerecharge/activity.vue | 3 --- 1 file changed, 3 deletions(-) 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