# Conflicts:
#	src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java

fix issue 1967

# 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

fix typo in comments

fix grammar errors

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

升级poi到5.0.0

🐛 fix 当进行加密导出时，由于输出流未关闭导致的文件损坏异常

initSheet catch exception避免哑处理异常输出错误日志便于异常排错

fix issue-2014

fix issue 2035

下载图片添加连接和读取的超时设置

# Conflicts:
#	pom.xml
#	src/main/java/com/alibaba/excel/converters/string/StringNumberConverter.java
#	src/main/java/com/alibaba/excel/metadata/format/DataFormatter.java
#	src/main/java/com/alibaba/excel/util/NumberDataFormatterUtils.java
#	src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java
#	src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
#	update.md