From 0de6edd66b21331abbb2513ee5b0b8013fea03df Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 四月 2024 10:22:02 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/enums.vue | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/components/view/enums.vue b/src/components/view/enums.vue
index b00c5a2..13fe502 100644
--- a/src/components/view/enums.vue
+++ b/src/components/view/enums.vue
@@ -102,6 +102,18 @@
}],
tagField: {},
selectField: {},
+ spanConfig:{
+ rows:[
+ {
+ name:'category',
+ index:1
+ },
+ // {
+ // name:'createUserName',
+ // index:5
+ // }
+ ],
+ },
requiredAdd:['category','label','value'],
requiredUp:['category','label','value']
},
--
Gitblit v1.9.3