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

spring

5 天以前 4538de1fa692cf5454ae7b1b061a8c298be96821

 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