diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java index b7dc810..8a3f8d2 100644 --- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java +++ b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java @@ -348,14 +348,15 @@ public class BeanProperty { */ private static List parseExtras(Class clazz, List origin) { List result = new ArrayList<>(); + MergedAnnotations annotations = MergedAnnotations.from(clazz); // 包含properties - if (clazz.isAnnotationPresent(Properties.class)) { - Properties properties = clazz.getAnnotation(Properties.class); + if (annotations.isPresent(Properties.class)) { + Properties properties = annotations.get(Properties.class).synthesize(); for (Property prop : properties.value()) { applyExtraProperty(result, origin, prop); } - } else if (clazz.isAnnotationPresent(Property.class)) { - applyExtraProperty(result, origin, clazz.getAnnotation(Property.class)); + } else if (annotations.isPresent(Property.class)) { + applyExtraProperty(result, origin, annotations.get(Property.class).synthesize()); } return result; }