diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17c8d2a66..68eb83149 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
## 5.1.5
### 新特性
+* 【poi 】 Excel合并单元格读取同一个值,不再为空
+
### Bug修复
-------------------------------------------------------------------------------------------------------------
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java b/hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java
index 63ecd1396..8c6c911f7 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java
@@ -1,7 +1,9 @@
package cn.hutool.db.dialect;
/**
- * 方言名
+ * 方言名
+ * 方言枚举列出了Hutool支持的所有数据库方言
+ *
* @author Looly
*
*/
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
index c32b50994..f5ca1de29 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
@@ -531,7 +531,7 @@ public class SqlBuilder implements Builder{
* @return 插入或更新的数据库字段列表
*/
public String[] getFieldArray() {
- return this.fields.toArray(new String[this.fields.size()]);
+ return this.fields.toArray(new String[0]);
}
/**
@@ -558,7 +558,7 @@ public class SqlBuilder implements Builder{
* @return 占位符对应的值列表
*/
public Object[] getParamValueArray() {
- return this.paramValues.toArray(new Object[this.paramValues.size()]);
+ return this.paramValues.toArray(new Object[0]);
}
/**
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
index 39c7618de..1a5684ed7 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
@@ -49,7 +49,7 @@ public class RowUtil {
if (length < 0) {
return new ArrayList<>(0);
}
- final List