From f70951d374cc7859c00edbf2685127ae3934529c Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: Mon, 5 Dec 2022 17:59:58 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8D=95=E5=85=83=E6=A0=BC=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=88=A4=E6=96=ADcellValue=E6=98=AF=E5=90=A6=E7=9B=B8?=
 =?UTF-8?q?=E7=AD=89=E6=96=B9=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 04a1bbb8a..6102eec50 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 @@ public class CellMergeStrategy extends AbstractMergeStrategy {
 						// 空值跳过不合并
 						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));
 						}