新增活动的警告修改

3 weeks ago · aca98aa791
1 changed files with 0 additions and 3 deletions
--- 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>