Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430

qushaowei

2023-11-22 3dd1c81c84d78a30fff6468ccb05f979f2d50966

 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"