From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/basic/tabletest/index.vue | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/views/basic/tabletest/index.vue b/src/views/basic/tabletest/index.vue
index cccd7e6..ce7eeef 100644
--- a/src/views/basic/tabletest/index.vue
+++ b/src/views/basic/tabletest/index.vue
@@ -161,7 +161,6 @@
},
methods: {
objectSpanMethod(data) {
- console.log('spanData', data)
if (data[3] === 2) {
if (data[2] % 2 === 0) {
data[4]({
--
Gitblit v1.9.3