合并冲突

licp

2024-04-29 ea1a8cf41c11f8f533cea594e1f1c03640cf4a96

 src/views/common/ztt-table.vue

@@ -181,6 +181,7 @@
        <el-table-column
          align="center"
          type="selection"
          :reserve-selection="options.reserveSelection"
          v-if="options.multiSelect && !isEdit"
          style="width: 55px;"
          :selectable="selectHandle"
@@ -666,7 +667,8 @@
        tableCellMerge: false,
        cancelRunCreated: false, // 是否执行created()内容
        isGenerateId: false,
        isGenerateField: 'id'
        isGenerateField: 'id',
        reserveSelection: false,
      }
    },
    // table自适应高度底部高度