合并冲突

licp

2024-04-29 ea1a8cf41c11f8f533cea594e1f1c03640cf4a96

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

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