Merge branch 'bugfix' into developing

# Conflicts:
#	src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java
#	src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
#	src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityDataTest.java

src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java

@@ -101,7 +101,7 @@ public class WriteSheetHolder extends AbstractWriteHolder {
      * @return
      */
     public int getNewRowIndexAndStartDoWrite() {
-        // 'getLastRowNum' doesn't matter if it has one or zero,is's zero
+        // 'getLastRowNum' doesn't matter if it has one or zero, it's zero
         int newRowIndex = 0;
         switch (writeLastRowTypeEnum) {
             case TEMPLATE_EMPTY: