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 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/components/view/enums.vue b/src/components/view/enums.vue
index dc63693..13fe502 100644
--- a/src/components/view/enums.vue
+++ b/src/components/view/enums.vue
@@ -112,7 +112,7 @@
// name:'createUserName',
// index:5
// }
- ],//鍚堝苟琛�,閫氬父娑夊強涓�涓瓧娈�
+ ],
},
requiredAdd:['category','label','value'],
requiredUp:['category','label','value']
--
Gitblit v1.9.3