合并冲突

licp

2024-04-03 67d2338b3dd43c5972159822aa3dd8f53cd3c78b

 src/components/view/enums.vue

@@ -102,6 +102,12 @@
               }],
               tagField: {},
               selectField: {},
          spanConfig:{
            rows:{
              name:'category',
              index:1
            },//合并行,通常涉及一个字段
          },
               requiredAdd:['category','label','value'],
               requiredUp:['category','label','value']
            },
@@ -153,4 +159,4 @@
         }
      }
   }
</script>
</script>