henryC
/
flyfish-framework
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wangyu 2021-09-29 11:34:17 +08:00
parent 86714d7722 7d2eedb231
commit 372ae99c73
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
View File

@ -407,7 +407,10 @@ public class BeanProperty {
}
// 处理值生成策略，此处可清除原策略
if (ArrayUtils.isNotEmpty(prop.generated())) {
property.extra.put(BeanProps.GENERATED, MergedAnnotations.from(prop.mapping()).get(MappedTo.class).asMap());
property.extra.put(BeanProps.GENERATED, MergedAnnotations.from(prop.generated()).get(Generation.class).asMap());
if (StringUtils.isBlank((String)property.extra.get(BeanProps.COMPONENT))) {
property.extra.put(BeanProps.COMPONENT, "input-hidden");
}
} else {
property.extra.remove(BeanProps.GENERATED);
if ("input-hidden".equals(property.extra.get(BeanProps.COMPONENT))) {