Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

4 天以前 7dfae8e6376ab235c0d560dc998acda39a7c28b9

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -39,13 +39,13 @@
        <el-table-column
          label="出库日期"
          prop="createTime"
          width="100"
          min-width="250"
          show-overflow-tooltip
        />
        <el-table-column
          label="供应商名称"
          prop="supplierName"
          width="160"
          width="250"
          show-overflow-tooltip
        />
        <el-table-column