Merge remote-tracking branch 'origin/master'

zhuzhuanzhuan

2024-03-01 84d12f2a9f883732219b273e697e23010af19c0f

 src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue

@@ -229,7 +229,7 @@
            align:'center',
          },
          {
            title: '设备编码',
            title: '统一编码',
            key: 'equipmentNum',
            type: JVXETypes.normal,
            disabled: true,