diff --git a/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json b/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json
index 24f1e9c24..e2990fac3 100644
--- a/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json
+++ b/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json
@@ -22530,6 +22530,153 @@
     "name": "io.nop.orm.support.OrmManyToManyHelper",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [],
+    "methods": [
+      {
+        "name": "getBizModuleId1",
+        "parameterTypes": []
+      },
+      {
+        "name": "getBizModuleId2",
+        "parameterTypes": []
+      },
+      {
+        "name": "getJoinPropName1",
+        "parameterTypes": []
+      },
+      {
+        "name": "getJoinPropName2",
+        "parameterTypes": []
+      },
+      {
+        "name": "getLabelPropOfRefEntity1",
+        "parameterTypes": []
+      },
+      {
+        "name": "getLabelPropOfRefEntity2",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingEntityName",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropDisplayName1",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropDisplayName2",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropEnDisplayName1",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropEnDisplayName2",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropInfo",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityRelationModel"
+        ]
+      },
+      {
+        "name": "getMappingPropInfo1",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropInfo2",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropName1",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropName1_ids",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropName1_label",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropName2",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropName2_ids",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingPropName2_label",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingTable",
+        "parameterTypes": []
+      },
+      {
+        "name": "getMappingTableName",
+        "parameterTypes": []
+      },
+      {
+        "name": "getRefBizObjName1",
+        "parameterTypes": []
+      },
+      {
+        "name": "getRefBizObjName2",
+        "parameterTypes": []
+      },
+      {
+        "name": "getRefEntityName1",
+        "parameterTypes": []
+      },
+      {
+        "name": "getRefEntityName2",
+        "parameterTypes": []
+      },
+      {
+        "name": "getRefProp1",
+        "parameterTypes": []
+      },
+      {
+        "name": "getRefProp2",
+        "parameterTypes": []
+      },
+      {
+        "name": "getReverseRefPropName1",
+        "parameterTypes": []
+      },
+      {
+        "name": "getReverseRefPropName2",
+        "parameterTypes": []
+      },
+      {
+        "name": "isManyToMany",
+        "parameterTypes": []
+      },
+      {
+        "name": "isMappingTable",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityModel"
+        ]
+      },
+      {
+        "name": "isOneToOne",
+        "parameterTypes": []
+      }
+    ],
+    "name": "io.nop.orm.support.OrmMappingTableMeta",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,
diff --git a/nop-codegen/src/main/resources/_vfs/nop/templates/dyn/{moduleId}/model/{entityMeta.bizObjName}/{entityMeta.bizObjName}.xbiz.xgen b/nop-codegen/src/main/resources/_vfs/nop/templates/dyn/{moduleId}/model/{entityMeta.bizObjName}/{entityMeta.bizObjName}.xbiz.xgen
index 848385527..0261c78f9 100644
--- a/nop-codegen/src/main/resources/_vfs/nop/templates/dyn/{moduleId}/model/{entityMeta.bizObjName}/{entityMeta.bizObjName}.xbiz.xgen
+++ b/nop-codegen/src/main/resources/_vfs/nop/templates/dyn/{moduleId}/model/{entityMeta.bizObjName}/{entityMeta.bizObjName}.xbiz.xgen
@@ -21,6 +21,7 @@
                 <arg name="selection" kind="FieldSelection"/>
                 <arg name="svcCtx" kind="ServiceContext"/>
 
+                <return graphql:type="${funcMeta.returnGqlType}" type="${funcMeta.returnType}"/>
                 <source>${raw(funcMeta.sourceXml)}</source>
             </c:unit>
         </c:for>
diff --git a/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json b/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json
index 3bcaeaac6..f1b62127e 100644
--- a/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json
+++ b/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json
@@ -915,16 +915,31 @@
         "allowWrite": false,
         "name": "PARAM_BIZ_OBJ_NAME"
       },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PARAM_DISPLAY_NAME"
+      },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
         "name": "PARAM_ENTITY_NAME"
       },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PARAM_FIELD_DISPLAY_NAME"
+      },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
         "name": "PARAM_FIELD_NAME"
       },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PARAM_OBJ_NAME"
+      },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
@@ -8269,6 +8284,10 @@
         "name": "getRelatedGroupList",
         "parameterTypes": []
       },
+      {
+        "name": "getRelatedGroupList_ids",
+        "parameterTypes": []
+      },
       {
         "name": "getRelatedGroupList_label",
         "parameterTypes": []
@@ -8427,6 +8446,12 @@
           "java.util.List"
         ]
       },
+      {
+        "name": "setRelatedGroupList_ids",
+        "parameterTypes": [
+          "java.util.List"
+        ]
+      },
       {
         "name": "setRemark",
         "parameterTypes": [
@@ -9079,6 +9104,10 @@
         "name": "getRelatedDeptList",
         "parameterTypes": []
       },
+      {
+        "name": "getRelatedDeptList_ids",
+        "parameterTypes": []
+      },
       {
         "name": "getRelatedDeptList_label",
         "parameterTypes": []
@@ -9091,6 +9120,10 @@
         "name": "getRelatedUserList",
         "parameterTypes": []
       },
+      {
+        "name": "getRelatedUserList_ids",
+        "parameterTypes": []
+      },
       {
         "name": "getRelatedUserList_label",
         "parameterTypes": []
@@ -9229,12 +9262,24 @@
           "java.util.List"
         ]
       },
+      {
+        "name": "setRelatedDeptList_ids",
+        "parameterTypes": [
+          "java.util.List"
+        ]
+      },
       {
         "name": "setRelatedUserIdList",
         "parameterTypes": [
           "java.util.List"
         ]
       },
+      {
+        "name": "setRelatedUserList_ids",
+        "parameterTypes": [
+          "java.util.List"
+        ]
+      },
       {
         "name": "setRemark",
         "parameterTypes": [
@@ -11012,6 +11057,10 @@
         "name": "getRelatedRoleList",
         "parameterTypes": []
       },
+      {
+        "name": "getRelatedRoleList_ids",
+        "parameterTypes": []
+      },
       {
         "name": "getRelatedRoleList_label",
         "parameterTypes": []
@@ -11236,6 +11285,12 @@
           "java.util.List"
         ]
       },
+      {
+        "name": "setRelatedRoleList_ids",
+        "parameterTypes": [
+          "java.util.List"
+        ]
+      },
       {
         "name": "setRemark",
         "parameterTypes": [
@@ -11482,6 +11537,10 @@
         "name": "getRelatedResourceList",
         "parameterTypes": []
       },
+      {
+        "name": "getRelatedResourceList_ids",
+        "parameterTypes": []
+      },
       {
         "name": "getRelatedResourceList_label",
         "parameterTypes": []
@@ -11494,6 +11553,10 @@
         "name": "getRelatedUserList",
         "parameterTypes": []
       },
+      {
+        "name": "getRelatedUserList_ids",
+        "parameterTypes": []
+      },
       {
         "name": "getRelatedUserList_label",
         "parameterTypes": []
@@ -11620,12 +11683,24 @@
           "java.util.List"
         ]
       },
+      {
+        "name": "setRelatedResourceList_ids",
+        "parameterTypes": [
+          "java.util.List"
+        ]
+      },
       {
         "name": "setRelatedUserIdList",
         "parameterTypes": [
           "java.util.List"
         ]
       },
+      {
+        "name": "setRelatedUserList_ids",
+        "parameterTypes": [
+          "java.util.List"
+        ]
+      },
       {
         "name": "setRemark",
         "parameterTypes": [
@@ -14114,6 +14189,10 @@
         "name": "getRelatedGroupList",
         "parameterTypes": []
       },
+      {
+        "name": "getRelatedGroupList_ids",
+        "parameterTypes": []
+      },
       {
         "name": "getRelatedGroupList_label",
         "parameterTypes": []
@@ -14126,6 +14205,10 @@
         "name": "getRelatedRoleList",
         "parameterTypes": []
       },
+      {
+        "name": "getRelatedRoleList_ids",
+        "parameterTypes": []
+      },
       {
         "name": "getRelatedRoleList_label",
         "parameterTypes": []
@@ -14414,12 +14497,24 @@
           "java.util.List"
         ]
       },
+      {
+        "name": "setRelatedGroupList_ids",
+        "parameterTypes": [
+          "java.util.List"
+        ]
+      },
       {
         "name": "setRelatedRoleIdList",
         "parameterTypes": [
           "java.util.List"
         ]
       },
+      {
+        "name": "setRelatedRoleList_ids",
+        "parameterTypes": [
+          "java.util.List"
+        ]
+      },
       {
         "name": "setRemark",
         "parameterTypes": [
@@ -20460,6 +20555,12 @@
           "java.util.function.Function"
         ]
       },
+      {
+        "name": "fromJavaClass",
+        "parameterTypes": [
+          "java.lang.Class"
+        ]
+      },
       {
         "name": "fromJdbcType",
         "parameterTypes": [
@@ -40104,6 +40205,10 @@
         "name": "getColumns",
         "parameterTypes": []
       },
+      {
+        "name": "getJavaClass",
+        "parameterTypes": []
+      },
       {
         "name": "getKind",
         "parameterTypes": []
@@ -40142,6 +40247,12 @@
           "java.util.List"
         ]
       },
+      {
+        "name": "setJavaClass",
+        "parameterTypes": [
+          "java.lang.Class"
+        ]
+      },
       {
         "name": "setOwnerEntityModel",
         "parameterTypes": [
@@ -44344,6 +44455,239 @@
     "name": "io.nop.orm.support.OrmEntity",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [],
+    "methods": [
+      {
+        "name": "castId",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityModel",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "copyRefProps",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntity",
+          "io.nop.orm.model.IEntityRelationModel",
+          "io.nop.orm.IOrmEntity"
+        ]
+      },
+      {
+        "name": "getEntityChange",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntity"
+        ]
+      },
+      {
+        "name": "getLabelForRefProps",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntitySet",
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "getLeftValue",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityJoinConditionModel",
+          "io.nop.orm.IOrmEntity"
+        ]
+      },
+      {
+        "name": "getOwnerKey",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityRelationModel",
+          "io.nop.orm.IOrmEntity"
+        ]
+      },
+      {
+        "name": "getOwnerKey",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityRelationModel",
+          "io.nop.orm.IOrmEntitySet"
+        ]
+      },
+      {
+        "name": "getPropFromSingleton",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntitySet",
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "getPropValue",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityPropModel",
+          "io.nop.orm.IOrmEntity"
+        ]
+      },
+      {
+        "name": "getRefIdFromSingleton",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntitySet",
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "getRefIds",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntitySet",
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "getRefPropId",
+        "parameterTypes": [
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "getRefProps",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntitySet",
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "getRightValue",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityJoinConditionModel",
+          "io.nop.orm.IOrmEntity"
+        ]
+      },
+      {
+        "name": "isAnyPropNull",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntity",
+          "[I"
+        ]
+      },
+      {
+        "name": "isFileComponent",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityComponentModel"
+        ]
+      },
+      {
+        "name": "isFileListComponent",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityComponentModel"
+        ]
+      },
+      {
+        "name": "isPropLoaded",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntity",
+          "io.nop.orm.model.IEntityPropModel"
+        ]
+      },
+      {
+        "name": "isPropValueEquals",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityPropModel",
+          "java.lang.Object",
+          "io.nop.orm.model.IEntityPropModel",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "isRefPropLoaded",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityRelationModel",
+          "io.nop.orm.IOrmEntity"
+        ]
+      },
+      {
+        "name": "isSameTenant",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntity",
+          "io.nop.orm.IOrmEntity"
+        ]
+      },
+      {
+        "name": "joinFileList",
+        "parameterTypes": [
+          "java.util.List"
+        ]
+      },
+      {
+        "name": "normalizePropType",
+        "parameterTypes": [
+          "java.util.List",
+          "io.nop.orm.model.IEntityModel",
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "normalizePropTypes",
+        "parameterTypes": [
+          "java.util.List",
+          "io.nop.orm.model.IEntityModel",
+          "java.util.List"
+        ]
+      },
+      {
+        "name": "parseFileList",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "setId",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityModel",
+          "io.nop.orm.IOrmEntity",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "setPropToSingleton",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntitySet",
+          "java.lang.String",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "setPropValue",
+        "parameterTypes": [
+          "io.nop.orm.model.IEntityPropModel",
+          "io.nop.orm.IOrmEntity",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "setRefIdToSingleton",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntitySet",
+          "java.lang.String",
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "setRefIds",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntitySet",
+          "java.lang.String",
+          "java.util.List"
+        ]
+      },
+      {
+        "name": "setRefProps",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntitySet",
+          "java.lang.String",
+          "java.util.List"
+        ]
+      }
+    ],
+    "name": "io.nop.orm.support.OrmEntityHelper",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,
@@ -50948,6 +51292,10 @@
         "name": "getDeleteAuth",
         "parameterTypes": []
       },
+      {
+        "name": "getDependOnProps",
+        "parameterTypes": []
+      },
       {
         "name": "getReadAuth",
         "parameterTypes": []
@@ -50960,6 +51308,10 @@
         "name": "getWriteAuth",
         "parameterTypes": []
       },
+      {
+        "name": "hasInternalDependOn",
+        "parameterTypes": []
+      },
       {
         "name": "setType",
         "parameterTypes": [
@@ -52911,6 +53263,12 @@
           "io.nop.core.lang.eval.IEvalAction"
         ]
       },
+      {
+        "name": "setValidator",
+        "parameterTypes": [
+          "io.nop.core.lang.eval.IEvalFunction"
+        ]
+      },
       {
         "name": "setValidator",
         "parameterTypes": [
diff --git a/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt b/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt
index 2b572cc62..b51ce400e 100644
--- a/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt
+++ b/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt
@@ -249,6 +249,7 @@
 /nop/codegen/xlib/web-gen.xlib
 /nop/core/_module
 /nop/core/app.module.yaml
+/nop/core/model/DictProvider/DictProvider.xbiz
 /nop/core/registry/api.register-model.xml
 /nop/core/registry/dialect.register-model.xml
 /nop/core/registry/dict.register-model.xml
@@ -344,6 +345,9 @@
 /nop/report/demo/base/10-导出Excel公式.xpt.xlsx
 /nop/report/demo/base/11-打印条码和二维码.xpt.xlsx
 /nop/report/demo/base/12-动态Sheet和动态列.xpt.xlsx
+/nop/report/demo/base/13-复杂结构列展开.xpt.xlsx
+/nop/report/demo/base/14-复杂结构行展开.xpt.xlsx
+/nop/report/demo/base/15-兄弟节点同时展开.xpt.xlsx
 /nop/report/demo/ext/report-with-params.xpt.xlsx
 /nop/report/demo/pages/demo.page.yaml
 /nop/report/demo/pages/report-with-params.page.yaml
@@ -352,6 +356,7 @@
 /nop/report/xlib/xpt-rt.xlib
 /nop/report/xlib/xpt.xlib
 /nop/rpc/imp/api.imp.xml
+/nop/rpc/imp/api.imp.xml.rej
 /nop/rpc/imp/template.api.xlsx
 /nop/schema/action-auth.xdef
 /nop/schema/api.xdef
@@ -707,6 +712,7 @@
 /nop/web/xlib/view-gen.xlib
 /nop/web/xlib/view-gen/impl_GenFromMeta.xpl
 /nop/web/xlib/web.xlib
+/nop/web/xlib/web.xlib.rej
 /nop/web/xlib/web/grid_crud.xpl
 /nop/web/xlib/web/impl_GenForm.xpl
 /nop/web/xlib/web/impl_GenGrid.xpl
diff --git a/nop-dyn/nop-dyn-meta/_templates/_NopDynApp.json b/nop-dyn/nop-dyn-meta/_templates/_NopDynApp.json
index 08ff17868..e14fc61f8 100644
--- a/nop-dyn/nop-dyn-meta/_templates/_NopDynApp.json
+++ b/nop-dyn/nop-dyn-meta/_templates/_NopDynApp.json
@@ -11,6 +11,6 @@
   "updateTime": "2000-01-01 14:00:00",
   "moduleMappings": null,
   "relatedModuleList": null,
-  "relatedModuleIdList": null,
+  "relatedModuleList_ids": null,
   "relatedModuleList_label": ""
 }
\ No newline at end of file
diff --git a/nop-dyn/nop-dyn-meta/_templates/_NopDynModule.json b/nop-dyn/nop-dyn-meta/_templates/_NopDynModule.json
index 8f19ae733..160487415 100644
--- a/nop-dyn/nop-dyn-meta/_templates/_NopDynModule.json
+++ b/nop-dyn/nop-dyn-meta/_templates/_NopDynModule.json
@@ -25,6 +25,6 @@
   "entityMetas": null,
   "domains": null,
   "relatedAppList": null,
-  "relatedAppIdList": null,
+  "relatedAppList_ids": null,
   "relatedAppList_label": ""
 }
\ No newline at end of file
diff --git a/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/en/_nop-dyn.i18n.yaml b/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/en/_nop-dyn.i18n.yaml
index ae05bb311..cc90110fe 100644
--- a/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/en/_nop-dyn.i18n.yaml
+++ b/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/en/_nop-dyn.i18n.yaml
@@ -28,9 +28,9 @@ prop:
       updatedBy: Updated By
       updateTime: Update Time
       moduleMappings: null
-      relatedModuleList: Module List
-      relatedModuleIdList: Module List
-      relatedModuleList_label: Module List
+      relatedModuleList: null
+      relatedModuleList_ids: null
+      relatedModuleList_label: null
     NopDynAppModule:
       appId: App ID
       moduleId: Module ID
@@ -237,9 +237,9 @@ prop:
       pages: Module Pages
       entityMetas: Entity Metas
       domains: Domains
-      relatedAppList: App List
-      relatedAppIdList: App List
-      relatedAppList_label: App List
+      relatedAppList: null
+      relatedAppList_ids: null
+      relatedAppList_label: null
     NopDynModuleDep:
       moduleId: Module ID
       depModuleId: Dep Module ID
diff --git a/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/zh-CN/_nop-dyn.i18n.yaml b/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/zh-CN/_nop-dyn.i18n.yaml
index 9b158d518..cd260ec60 100644
--- a/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/zh-CN/_nop-dyn.i18n.yaml
+++ b/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/zh-CN/_nop-dyn.i18n.yaml
@@ -23,9 +23,9 @@ prop:
       createdBy: 创建人
       displayName: 显示名
       moduleMappings: null
-      relatedModuleIdList: 关联模块列表
-      relatedModuleList: 关联模块列表
-      relatedModuleList_label: 关联模块列表
+      relatedModuleList: relatedModuleList
+      relatedModuleList_ids: relatedModuleList
+      relatedModuleList_label: relatedModuleList
       status: 状态
       status_label: 状态
       updateTime: 修改时间
@@ -231,9 +231,9 @@ prop:
       moduleName: 模块名
       moduleVersion: 模块版本
       pages: 模块页面
-      relatedAppIdList: 所属应用列表
-      relatedAppList: 所属应用列表
-      relatedAppList_label: 所属应用列表
+      relatedAppList: relatedAppList
+      relatedAppList_ids: relatedAppList
+      relatedAppList_label: relatedAppList
       sqls: SQL语句
       status: 状态
       status_label: 状态
diff --git a/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/nop/dyn/model/NopDynApp/_NopDynApp.xmeta b/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/nop/dyn/model/NopDynApp/_NopDynApp.xmeta
index d52e47714..8faec24fd 100644
--- a/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/nop/dyn/model/NopDynApp/_NopDynApp.xmeta
+++ b/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/nop/dyn/model/NopDynApp/_NopDynApp.xmeta
@@ -63,20 +63,39 @@
                 <item bizObjName="NopDynAppModule"/>
             </schema>
         </prop>
-        <prop name="relatedModuleList" displayName="关联模块列表" i18n-en:displayName="Module List" ext:kind="to-many"
-              insertable="false" updatable="false" internal="true" lazy="true">
+        <prop name="relatedModuleList" displayName="relatedModuleList" insertable="false" updatable="false"
+              depends="~moduleMappings" internal="true" lazy="true">
             <schema>
                 <item bizObjName="NopDynModule"/>
             </schema>
+            <getter>
+                            import io.nop.orm.support.OrmEntityHelper;
+                            return OrmEntityHelper.getRefProps(
+                                entity.getModuleMappings(), "module");
+                        </getter>
         </prop>
-        <prop name="relatedModuleIdList" displayName="关联模块列表" i18n-en:displayName="Module List" insertable="false"
-              updatable="false" ext:relation="relatedModuleList" graphql:labelProp="relatedModuleList_label" lazy="true"
-              internal="true">
-            <schema type="List&lt;java.lang.String&gt;"/>
+        <prop name="relatedModuleList_ids" displayName="relatedModuleList" insertable="false" updatable="false"
+              graphql:labelProp="relatedModuleList_label" lazy="true" internal="true" depends="~moduleMappings">
+            <schema type="List&lt;String&gt;"/>
+            <getter>
+                            import io.nop.orm.support.OrmEntityHelper;
+                            return OrmEntityHelper.getRefIds(
+                                entity.getModuleMappings(), "module");
+                        </getter>
+            <setter>
+                            import io.nop.orm.support.OrmEntityHelper;
+                            OrmEntityHelper.setRefIds(
+                                entity.getModuleMappings(), "module",value);
+                        </setter>
         </prop>
-        <prop name="relatedModuleList_label" displayName="关联模块列表" i18n-en:displayName="Module List" lazy="true"
-              internal="true">
+        <prop name="relatedModuleList_label" displayName="relatedModuleList" internal="true" depends="~moduleMappings"
+              lazy="true">
             <schema type="String"/>
+            <getter>
+                    import io.nop.orm.support.OrmEntityHelper;
+                    return OrmEntityHelper.getLabelForRefProps(
+                        entity.getModuleMappings(), "module");
+                </getter>
         </prop>
     </props>
 </meta>
\ No newline at end of file
diff --git a/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/nop/dyn/model/NopDynModule/_NopDynModule.xmeta b/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/nop/dyn/model/NopDynModule/_NopDynModule.xmeta
index 13d3a1960..61bc9c1d6 100644
--- a/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/nop/dyn/model/NopDynModule/_NopDynModule.xmeta
+++ b/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/nop/dyn/model/NopDynModule/_NopDynModule.xmeta
@@ -136,20 +136,39 @@
                 <item bizObjName="NopDynDomain"/>
             </schema>
         </prop>
-        <prop name="relatedAppList" displayName="所属应用列表" i18n-en:displayName="App List" ext:kind="to-many"
-              insertable="false" updatable="false" internal="true" lazy="true">
+        <prop name="relatedAppList" displayName="relatedAppList" insertable="false" updatable="false"
+              depends="~appMappings" internal="true" lazy="true">
             <schema>
                 <item bizObjName="NopDynApp"/>
             </schema>
-        </prop>
-        <prop name="relatedAppIdList" displayName="所属应用列表" i18n-en:displayName="App List" insertable="false"
-              updatable="false" ext:relation="relatedAppList" graphql:labelProp="relatedAppList_label" lazy="true"
-              internal="true">
-            <schema type="List&lt;java.lang.String&gt;"/>
-        </prop>
-        <prop name="relatedAppList_label" displayName="所属应用列表" i18n-en:displayName="App List" lazy="true"
-              internal="true">
+            <getter>
+                            import io.nop.orm.support.OrmEntityHelper;
+                            return OrmEntityHelper.getRefProps(
+                                entity.getAppMappings(), "app");
+                        </getter>
+        </prop>
+        <prop name="relatedAppList_ids" displayName="relatedAppList" insertable="false" updatable="false"
+              graphql:labelProp="relatedAppList_label" lazy="true" internal="true" depends="~appMappings">
+            <schema type="List&lt;String&gt;"/>
+            <getter>
+                            import io.nop.orm.support.OrmEntityHelper;
+                            return OrmEntityHelper.getRefIds(
+                                entity.getAppMappings(), "app");
+                        </getter>
+            <setter>
+                            import io.nop.orm.support.OrmEntityHelper;
+                            OrmEntityHelper.setRefIds(
+                                entity.getAppMappings(), "app",value);
+                        </setter>
+        </prop>
+        <prop name="relatedAppList_label" displayName="relatedAppList" internal="true" depends="~appMappings"
+              lazy="true">
             <schema type="String"/>
+            <getter>
+                    import io.nop.orm.support.OrmEntityHelper;
+                    return OrmEntityHelper.getLabelForRefProps(
+                        entity.getAppMappings(), "app");
+                </getter>
         </prop>
     </props>
 </meta>
\ No newline at end of file
diff --git a/nop-dyn/nop-dyn-service/src/test/java/io/nop/dyn/service/codegen/TestDynCodeGen.java b/nop-dyn/nop-dyn-service/src/test/java/io/nop/dyn/service/codegen/TestDynCodeGen.java
index 6c1afc534..6e0a7f04f 100644
--- a/nop-dyn/nop-dyn-service/src/test/java/io/nop/dyn/service/codegen/TestDynCodeGen.java
+++ b/nop-dyn/nop-dyn-service/src/test/java/io/nop/dyn/service/codegen/TestDynCodeGen.java
@@ -28,13 +28,11 @@
 import io.nop.graphql.core.engine.IGraphQLEngine;
 import io.nop.orm.IOrmTemplate;
 import jakarta.inject.Inject;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@Disabled
 @NopTestConfig(localDb = true, initDatabaseSchema = true)
 public class TestDynCodeGen extends JunitBaseTestCase {