Merge branch 'develop'

qushaowei

2023-11-22 445cfc2c5cee3d8fc0f8f1ffae5b66d9c761e681

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

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