From 25f89bd236b75cf48d56dbf0163ca26ad877e984 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:08 +0800
Subject: [PATCH] update 适配 sa-token 替换新依赖 sa-token-spring-boot3-starter
---
ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java b/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java
index 04a1bbb..6102eec 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java
@@ -86,7 +86,7 @@
// 绌哄�艰烦杩囦笉鍚堝苟
continue;
}
- if (cellValue != val) {
+ if (!cellValue.equals(val)) {
if (i - repeatCell.getCurrent() > 1) {
cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex - 1, colNum, colNum));
}
--
Gitblit v1.9.3