合并冲突掉的代码

spring

2025-09-02 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -46,7 +46,7 @@
        <el-table-column
          label="出库日期"
          prop="createTime"
          min-width="250"
          min-width="130"
          show-overflow-tooltip
        />
        <el-table-column
@@ -82,13 +82,13 @@
        <el-table-column
          label="含税单价(元)"
          prop="taxInclusiveUnitPrice"
          width="100"
          width="200"
          show-overflow-tooltip
        />
        <el-table-column
          label="含税总价(元)"
          prop="taxInclusiveTotalPrice"
          width="100"
          width="200"
          show-overflow-tooltip
        />
        <el-table-column