From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突
---
src/views/plan/segmentmerge/operation-technology-form.vue | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/views/plan/segmentmerge/operation-technology-form.vue b/src/views/plan/segmentmerge/operation-technology-form.vue
index cf91b9d..091f0fd 100644
--- a/src/views/plan/segmentmerge/operation-technology-form.vue
+++ b/src/views/plan/segmentmerge/operation-technology-form.vue
@@ -215,7 +215,6 @@
})
}
})
- console.log('resultList', resultList)
if (resultList.length > 0 && resultList[0].routingList.length > 0) {
let flag = true
resultList.forEach((ele) => {
--
Gitblit v1.9.3