Merge remote-tracking branch 'origin/mdc-test' into mdc-test

Lius

2023-11-13 3a8223b71d18205d40b894fd0b4c0fa1ca773e86

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

@@ -69,7 +69,7 @@
        size="middle"
        bordered
        rowKey="id"
        :scroll="{x:true}"
        :scroll="{ x: 'calc(1500px + 50%)', y: 900 }"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"