From 1f81ea3da2aa638453f71f13cd1c42ef6b27a2d3 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期日, 24 四月 2022 08:18:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/pages/show/laborRelations/LaborRelations.vue | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/pages/show/laborRelations/LaborRelations.vue b/src/pages/show/laborRelations/LaborRelations.vue
index 43bb0f8..8b800fe 100644
--- a/src/pages/show/laborRelations/LaborRelations.vue
+++ b/src/pages/show/laborRelations/LaborRelations.vue
@@ -232,6 +232,7 @@
}
},
methods: {
+ //鍚堝苟琛屽拰鍒�
mergeColumnTableCell({rowIndex, columnIndex}) {
// 鍚堝苟鍒�
if (columnIndex === 0) {
--
Gitblit v1.9.1