Merge remote-tracking branch 'origin/test' into test

service-base/src/main/java/com/simuwang/base/common/util/ExcelUtil.java

@@ -420,7 +420,7 @@ public class ExcelUtil {
                             }
                         }
                     }
-                    preEndRowIndex = preEndRowIndex + rowLength -1;
+                    preEndRowIndex = preEndRowIndex + rowLength - 1 < 0 ? 0 : preEndRowIndex + rowLength - 1;
                 }
             }
             // 将Excel工作簿写入输出流