From 00b6ca5dfe5328444efca61afdff609228621ffd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 10 一月 2023 17:40:42 +0800
Subject: [PATCH] update springboot-admin 2.7.9 => 2.7.10 update easyexcel 3.1.4 => 3.1.5 update redisson 3.19.0 => 3.19.1
---
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