合并冲突

licp

2024-05-28 52e18000ace434b2acdebce5e118c45c337a3fe7

 src/views/basic/part/part-form.vue

@@ -472,9 +472,6 @@
        ],
        materialType: [
          { required: true, message: '零件类型不能为空', trigger: 'change' }
        ],
        materialAttribute: [
          { required: true, message: '零件属性不能为空', trigger: 'change' }
        ]
      },
      ruleOptions: [],