From 17bed3a7f7e90b23afb5def223fd7a285ff6cc24 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 10 Aug 2021 08:40:56 +0800
Subject: [PATCH] 冲突

---
 src/views/feedbackReport/feedbackReport.vue |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/views/feedbackReport/feedbackReport.vue b/src/views/feedbackReport/feedbackReport.vue
index 26caf76..bd72cc1 100644
--- a/src/views/feedbackReport/feedbackReport.vue
+++ b/src/views/feedbackReport/feedbackReport.vue
@@ -431,8 +431,7 @@
       rowDel(row) {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+          cancelButtonText: "取消",           type: "warning",
         })
           .then(() => {
             return remove(row.id);

--
Gitblit v1.9.3