From dff404a76987de5b632ae635a6dea6c95dc37a4d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 四月 2024 16:58:59 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/enums.vue | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/components/view/enums.vue b/src/components/view/enums.vue
index 82eddd5..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']
},
@@ -153,4 +165,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3