Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 b6b2c379bd92f076acd16801b1442604ea21fc5d

 src/views/mdc/base/EquipmentList.vue

@@ -77,7 +77,6 @@
      <a-table
        ref="table"
        bordered
        size="middle"
        rowKey="id"
        :scroll="{x:'max-content',y:465}"
        :columns="columns"