ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v5-dev' into v5-dev

Browse Source 
# Conflicts:
#	hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java
This commit is contained in:
VampireAchao 2022-03-16 13:44:18 +08:00
commit 0723813452
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java
View File

@ -15,7 +15,7 @@ public class DictTest {
.set("key1", 1)//int
.set("key2", 1000L)//long
.set("key3", DateTime.now());//Date
Long v2 = dict.getLong("key2");
Assert.assertEquals(Long.valueOf(1000L), v2);
}

10
hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java
View File

@ -139,11 +139,6 @@ public class ActiveEntity extends Entity {
return (ActiveEntity) super.setFieldNames(fieldNames);
}
@Override
public ActiveEntity addFieldNames(String... fieldNames) {
return (ActiveEntity) super.addFieldNames(fieldNames);
}
/**
* 通过lambda批量设置值
* @param fields lambda,不能为空
@ -154,6 +149,11 @@ public class ActiveEntity extends Entity {
return (ActiveEntity) super.setFields(fields);
}
@Override
public ActiveEntity addFieldNames(String... fieldNames) {
return (ActiveEntity) super.addFieldNames(fieldNames);
}
@Override
public <T> ActiveEntity parseBean(T bean) {
return (ActiveEntity) super.parseBean(bean);