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

gaoluyang

7 天以前 9fca6b504946f7ca77306edea6bc26f4795b7c3a

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -38,8 +38,8 @@
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column
          label="出库日期"
          prop="createDate"
          width="100"
          prop="createTime"
          width="160"
          show-overflow-tooltip
        />
        <el-table-column