合并代码，解决代码冲突

ludc

2023-06-05 9474fadca23df051af1789b2078aca9c3163a017

 Source/UBCS-WEB/src/views/modeling/enumeration.vue

@@ -57,7 +57,7 @@
        index: true,
        tabs:true,
        rowKey:'id',
        searchMenuSpan:8,
        searchMenuSpan:4,
        column:[
          {
            label:"枚举名称",