合并冲突

licp

2024-04-19 0de6edd66b21331abbb2513ee5b0b8013fea03df

 src/components/view/enums.vue

@@ -112,7 +112,7 @@
              //   name:'createUserName',
              //   index:5
              // }
            ],//合并行,通常涉及一个字段
            ],
          },
               requiredAdd:['category','label','value'],
               requiredUp:['category','label','value']