From 28dec6acaa317816a0c9315023672741a2137cb8 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 30 五月 2025 10:30:22 +0800
Subject: [PATCH] 处理git dev分支冲突
---
src/components/Table/ETable.vue | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/components/Table/ETable.vue b/src/components/Table/ETable.vue
index 88c6f57..91f767a 100644
--- a/src/components/Table/ETable.vue
+++ b/src/components/Table/ETable.vue
@@ -7,14 +7,11 @@
:show-selection="showSelection"
:max-height="maxHeight"
@selection-change="handleSelectionChange"
-<<<<<<< HEAD
-=======
@row-click="handleRowClick"
@row-dblclick="handleRowDblClick"
@cell-click="handleCellClick"
:max-width="maxWidth"
@export="handleExport"
->>>>>>> master
>
<el-table-column v-if="showSelection" type="selection" width="55" align="center" />
<el-table-column v-if="showIndex" label="搴忓彿" type="index" width="60" align="center" />
@@ -57,8 +54,6 @@
import { ElMessage, ElMessageBox } from 'element-plus'
const props = defineProps({
-<<<<<<< HEAD
-=======
// 鏈�澶у搴�
maxWidth: {
type: [String, Number],
@@ -80,7 +75,6 @@
type: Function,
default: () => {}
},
->>>>>>> master
// 楂樺害
maxHeight: {
type: [String, Number],
--
Gitblit v1.9.3