Merge remote-tracking branch 'origin/master'

zhuzhuanzhuan

2023-12-26 ae3ad906ed4b09f72fc716957c4dbbe16341b38f

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

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