Merge branch 'bugfix' into developing

# Conflicts:
#	pom.xml
#	src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java

src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -231,10 +232,12 @@ public class XlsxSaxAnalyser implements ExcelReadExecutor {
         if (commentsTable == null) {
             return;
         }
-        Map<CellAddress, XSSFComment> cellComments = commentsTable.getCellComments();
-        for (XSSFComment xssfComment : cellComments.values()) {
-            CellExtra cellExtra = new CellExtra(CellExtraTypeEnum.COMMENT, xssfComment.getString().toString(),
-                xssfComment.getRow(), xssfComment.getColumn());
+        Iterator<CellAddress> cellAddresses = commentsTable.getCellAddresses();
+        for (Iterator<CellAddress> it = cellAddresses; it.hasNext(); ) {
+            CellAddress cellAddress = it.next();
+            XSSFComment cellComment = commentsTable.findCellComment(cellAddress);
+            CellExtra cellExtra = new CellExtra(CellExtraTypeEnum.COMMENT, cellComment.getString().toString(),
+                cellAddress.getRow(), cellAddress.getColumn());
             xlsxReadContext.readSheetHolder().setCellExtra(cellExtra);
             xlsxReadContext.analysisEventProcessor().extra(xlsxReadContext);
         }

src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java

@@ -1,13 +1,8 @@
 package com.alibaba.easyexcel.test.temp;
 
-import java.io.File;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
-import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.IndexedColors;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -19,10 +14,6 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.merge.OnceAbsoluteMergeStrategy;
 import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.metadata.style.WriteCellStyle;
-import com.alibaba.excel.write.metadata.style.WriteFont;
-import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
-import com.alibaba.fastjson.JSON;
 
 /**
  * 临时测试

src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java

@@ -973,7 +973,7 @@ public class DataFormatter1 implements Observer {
             if (evaluator == null) {
                 return cell.getCellFormula();
             }
-            cellType = evaluator.evaluateFormulaCellEnum(cell);
+            cellType = evaluator.evaluateFormulaCell(cell);
         }
         switch (cellType) {
             case NUMERIC: