Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 5e0589cc9ba6ef397470d38a98bf4c16e683b4da

 src/views/lsw/LswMaterialInventoryList.vue

@@ -77,6 +77,11 @@
          align: 'center',
          dataIndex: 'inventoryStatus_dictText'
        },
        {
          title: '热处理标记',
          align: 'center',
          dataIndex: 'warehouseId_dictText'
        },
      ],
      url: {
        list: '/lsw/materialInventory/list',