From cb2e79e8374725da81b19c518405f1b91c86e601 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 07 四月 2022 14:27:54 +0800
Subject: [PATCH] Merge branch 'master' of D:\workspace\ztqt with conflicts.
---
src/views/safetyproduction/feature.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/views/safetyproduction/feature.vue b/src/views/safetyproduction/feature.vue
index 86ed180..eee259b 100644
--- a/src/views/safetyproduction/feature.vue
+++ b/src/views/safetyproduction/feature.vue
@@ -321,8 +321,7 @@
}else {
this.$message({
type: "warning",
- // message: res.data.message,
- message: "当前A级要素仍然有已绑定的B级要素,无法删除"
+ message: res.data.message,
});
}
});
--
Gitblit v1.9.2