From f5e6487a78789ee372a8c6458bfd0cb740d6a0e8 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 13 五月 2026 22:13:58 +0800
Subject: [PATCH] 青岛维护
---
src/views/business/allocation/index.vue | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/views/business/allocation/index.vue b/src/views/business/allocation/index.vue
index 3aa78ad..8061001 100644
--- a/src/views/business/allocation/index.vue
+++ b/src/views/business/allocation/index.vue
@@ -111,12 +111,17 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
+<<<<<<< HEAD
<!--
<el-table-column
+=======
+ <!-- <el-table-column
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
label="妗堜緥缂栧彿"
align="center"
prop="caseNo"
width="120"
+<<<<<<< HEAD
/>
<el-table-column
label="鎹愮尞鑰呯紪鍙�"
@@ -145,6 +150,11 @@
show-overflow-tooltip
/>
-->
+=======
+ /> -->
+
+ <el-table-column label="濮撳悕" align="center" prop="name" width="100" />
+>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
<el-table-column
label="浣忛櫌鍙�"
align="center"
--
Gitblit v1.9.3