From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突

---
 src/components/do/b1-ins-order/fiberoptic-config-two.vue |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/components/do/b1-ins-order/fiberoptic-config-two.vue b/src/components/do/b1-ins-order/fiberoptic-config-two.vue
index d5dfea7..4e8b4b0 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config-two.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config-two.vue
@@ -100,6 +100,8 @@
                   <span v-else>{{ scope.row.ask }}</span>
                 </template>
               </el-table-column>
+              <el-table-column prop="tell" label="瑕佹眰鎻忚堪" show-overflow-tooltip width="150">
+              </el-table-column>
             </el-table>
           </div>
         </el-col>

--
Gitblit v1.9.3