update 适配 新序列化注解

疯狂的狮子Li

2023-01-13 2023de973e6adb490bba962b1d830fd8e4be9418

 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));
                  }