From 9474fadca23df051af1789b2078aca9c3163a017 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 17:05:54 +0800
Subject: [PATCH] 合并代码，解决代码冲突
---
Source/UBCS-WEB/src/components/Tree/TemplatePro.vue | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
index 8771a12..67047ed 100644
--- a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
@@ -19,21 +19,14 @@
type: {},
Taboption: {
column: [{
- icon: 'el-icon-info',
label: '妯℃澘灞炴��',
prop: 'tab1',
}, {
- icon: 'el-icon-warning',
label: '妯℃澘娴佺▼',
prop: 'tab2',
}, {
- icon: 'el-icon-question',
label: '妯℃澘闃舵',
prop: 'tab3',
- }, {
- icon: 'el-icon-question',
- label: '妯℃澘鎸夐挳娴佺▼',
- prop: 'tab4',
}]
},
--
Gitblit v1.10.0