diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/MPJLambdaWrapperX.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/MPJLambdaWrapperX.java
index aed2f02df..6b0de23c5 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/MPJLambdaWrapperX.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/MPJLambdaWrapperX.java
@@ -27,6 +27,13 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> {
         return this;
     }
 
+    public <S> MPJLambdaWrapperX<T> likeRightIfPresent(SFunction<S, ?> column, String val) {
+        if (StringUtils.hasText(val)) {
+            return (MPJLambdaWrapperX<T>) super.likeRight(column, val);
+        }
+        return this;
+    }
+
     public <S> MPJLambdaWrapperX<T> inIfPresent(SFunction<S, ?> column, Collection<?> values) {
         if (ObjectUtil.isAllNotEmpty(values) && !ArrayUtil.isEmpty(values)) {
             return (MPJLambdaWrapperX<T>) super.in(column, values);
@@ -102,7 +109,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> {
         return this;
     }
 
-
     // ========== 重写父类方法，方便链式调用 ==========
 
     @Override
diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java b/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java
index b3c8116cd..d04b85c7e 100644
--- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java
+++ b/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java
@@ -21,6 +21,9 @@ public enum CodegenFrontTypeEnum {
     VUE3_VBEN5_ANTD_SCHEMA(40), // Vue3 VBEN5 + ANTD + schema 模版
     VUE3_VBEN5_ANTD_GENERAL(41), // Vue3 VBEN5 + ANTD 标准模版
 
+    VUE3_VBEN5_ANTDV_NEXT_SCHEMA(42), // Vue3 VBEN5 + Antdv Next + schema 模版
+    VUE3_VBEN5_ANTDV_NEXT_GENERAL(43), // Vue3 VBEN5 + Antdv Next 标准模版
+
     VUE3_VBEN5_EP_SCHEMA(50), // Vue3 VBEN5 + EP + schema 模版
     VUE3_VBEN5_EP_GENERAL(51), // Vue3 VBEN5 + EP 标准模版
 
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
index 1ba0cd7ed..70939a6e5 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
@@ -241,6 +241,46 @@ public class CodegenEngine {
                     vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-list.vue"))
             .put(CodegenFrontTypeEnum.VUE3_VBEN5_EP_GENERAL.getType(), vue3Vben5EpGeneralTemplatePath("views/modules/list_sub_erp.vue"),  // 特殊：主子表专属逻辑
                     vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-list.vue"))
+            // VUE3_VBEN5_ANTDV_NEXT_SCHEMA
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(), vue3Vben5AntdvNextSchemaTemplatePath("views/data.ts"),
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/data.ts"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(), vue3Vben5AntdvNextSchemaTemplatePath("views/index.vue"),
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(), vue3Vben5AntdvNextSchemaTemplatePath("views/form.vue"),
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/form.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(), vue3Vben5AntdvNextSchemaTemplatePath("views/import.vue"),
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/import-form.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(), vue3Vben5AntdvNextSchemaTemplatePath("api/api.ts"),
+                    vue3VbenFilePath("api/${table.moduleName}/${table.businessName}/index.ts"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(), vue3Vben5AntdvNextSchemaTemplatePath("views/modules/form_sub_normal.vue"),  // 特殊：主子表专属逻辑
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-form.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(), vue3Vben5AntdvNextSchemaTemplatePath("views/modules/form_sub_inner.vue"),  // 特殊：主子表专属逻辑
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-form.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(), vue3Vben5AntdvNextSchemaTemplatePath("views/modules/form_sub_erp.vue"),  // 特殊：主子表专属逻辑
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-form.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(), vue3Vben5AntdvNextSchemaTemplatePath("views/modules/list_sub_inner.vue"),  // 特殊：主子表专属逻辑
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-list.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(), vue3Vben5AntdvNextSchemaTemplatePath("views/modules/list_sub_erp.vue"),  // 特殊：主子表专属逻辑
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-list.vue"))
+            // VUE3_VBEN5_ANTDV_NEXT_GENERAL
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(), vue3Vben5AntdvNextGeneralTemplatePath("views/index.vue"),
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(), vue3Vben5AntdvNextGeneralTemplatePath("views/form.vue"),
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/form.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(), vue3Vben5AntdvNextGeneralTemplatePath("views/import.vue"),
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/import-form.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(), vue3Vben5AntdvNextGeneralTemplatePath("api/api.ts"),
+                    vue3VbenFilePath("api/${table.moduleName}/${table.businessName}/index.ts"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(), vue3Vben5AntdvNextGeneralTemplatePath("views/modules/form_sub_normal.vue"),  // 特殊：主子表专属逻辑
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-form.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(), vue3Vben5AntdvNextGeneralTemplatePath("views/modules/form_sub_inner.vue"),  // 特殊：主子表专属逻辑
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-form.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(), vue3Vben5AntdvNextGeneralTemplatePath("views/modules/form_sub_erp.vue"),  // 特殊：主子表专属逻辑
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-form.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(), vue3Vben5AntdvNextGeneralTemplatePath("views/modules/list_sub_inner.vue"),  // 特殊：主子表专属逻辑
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-list.vue"))
+            .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(), vue3Vben5AntdvNextGeneralTemplatePath("views/modules/list_sub_erp.vue"),  // 特殊：主子表专属逻辑
+                    vue3VbenFilePath("views/${table.moduleName}/${table.businessName}/modules/${subSimpleClassName_strikeCase}-list.vue"))
             .build();
 
     @Resource
@@ -682,6 +722,14 @@ public class CodegenEngine {
         return "codegen/vue3_vben5_ele/general/" + path + ".vm";
     }
 
+    private static String vue3Vben5AntdvNextSchemaTemplatePath(String path) {
+        return "codegen/vue3_vben5_antdv_next/schema/" + path + ".vm";
+    }
+
+    private static String vue3Vben5AntdvNextGeneralTemplatePath(String path) {
+        return "codegen/vue3_vben5_antdv_next/general/" + path + ".vm";
+    }
+
     private static boolean isSubTemplate(String path) {
         return path.contains("_sub");
     }
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/java/service/serviceImpl.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/java/service/serviceImpl.vm
index c73bd7c7f..98d8358f3 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/java/service/serviceImpl.vm
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/java/service/serviceImpl.vm
@@ -1,6 +1,15 @@
 package ${basePackage}.module.${table.moduleName}.service.${table.businessName};
 
 import cn.hutool.core.collection.CollUtil;
+#set ($hasSubJoinMany = false)
+#foreach ($subTable in $subTables)
+#if ( $subTable.subJoinMany )
+#set ($hasSubJoinMany = true)
+#end
+#end
+#if ( $subTables && $subTables.size() > 0 && $table.templateType != 11 && $hasSubJoinMany )
+import cn.hutool.core.util.ObjectUtil;
+#end
 import org.springframework.stereotype.Service;
 import ${jakartaPackage}.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm
index 24eba2321..f1917cec1 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm
@@ -123,6 +123,7 @@ export function useFormSchema(): VbenFormSchema[] {
   #elseif($column.htmlType == "inputNumber")## 数字输入框
       component: 'InputNumber',
       componentProps: {
+        class: '!w-full',
         min: 0,
         placeholder: '请输入${comment}',
       },
@@ -339,6 +340,7 @@ export function use${subSimpleClassName}FormSchema(): VbenFormSchema[] {
                             #elseif($column.htmlType == "inputNumber")## 数字输入框
                                 component: 'InputNumber',
                                 componentProps: {
+                                    class: '!w-full',
                                     min: 0,
                                     placeholder: '请输入${comment}',
                                 },
@@ -572,6 +574,7 @@ export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${api
                                 #elseif($column.htmlType == "inputNumber")## 数字输入框
                                     component: 'InputNumber',
                                     componentProps: {
+                                        class: '!w-full',
                                         min: 0,
                                         placeholder: '请输入${comment}',
                                     },
@@ -613,4 +616,4 @@ export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${api
     }
     #end
 #end
-#end
\ No newline at end of file
+#end
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/form.vue.vm
new file mode 100644
index 000000000..03db716b7
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/form.vue.vm
@@ -0,0 +1,325 @@
+<script lang="ts" setup>
+import type { Rule } from 'antdv-next/es/form';
+import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { Tinymce as RichTextarea } from '#/components/tinymce';
+import { ImageUpload, FileUpload } from "#/components/upload";
+import { message, Tabs, Form, Input, TextArea, Select, RadioGroup, Radio, CheckboxGroup, Checkbox, DatePicker, TreeSelect } from 'antdv-next';
+#if($table.templateType == 2)## 树表需要导入这些
+import { get${simpleClassName}List } from '#/api/${table.moduleName}/${table.businessName}';
+import { handleTree } from '@vben/utils'
+#end
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 10 || $table.templateType == 12 )
+  #foreach ($subSimpleClassName in $subSimpleClassNames)
+  #set ($index = $foreach.count - 1)
+  #set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($index))
+  import ${subSimpleClassName}Form from './${subSimpleClassName_strikeCase}-form.vue'
+  #end
+#end
+
+import { $t } from '#/locales';
+import { get${simpleClassName}, create${simpleClassName}, update${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
+
+const emit = defineEmits(['success']);
+
+const formRef = ref();
+const formData = ref<Partial<${simpleClassName}Api.${simpleClassName}>>({
+#foreach ($column in $columns)
+  #if ($column.createOperation || $column.updateOperation)
+    #if ($column.htmlType == "checkbox")
+        $column.javaField: [],
+    #else
+        $column.javaField: undefined,
+    #end
+  #end
+#end
+});
+const rules: Record<string, Rule[]> = {
+  #foreach ($column in $columns)
+    #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+      #set($comment=$column.columnComment)
+        $column.javaField: [{ required: true, message: '${comment}不能为空', trigger: #if($column.htmlType == 'select')'change'#else'blur'#end }],
+    #end
+  #end
+};
+## 特殊：树表专属逻辑
+#if ( $table.templateType == 2 )
+const ${classNameVar}Tree = ref<any[]>([]) // 树形结构
+#end
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['${table.classComment}'])
+    : $t('ui.actionTitle.create', ['${table.classComment}']);
+});
+
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 10 || $table.templateType == 12 )
+  #if ( $subTables && $subTables.size() > 0 )
+  /** 子表的表单 */
+  const subTabsName = ref('$subClassNameVars.get(0)')
+    #foreach ($subClassNameVar in $subClassNameVars)
+      #set ($index = $foreach.count - 1)
+      #set ($subSimpleClassName = $subSimpleClassNames.get($index))
+      const ${subClassNameVar}FormRef = ref<InstanceType<typeof ${subSimpleClassName}Form>>()
+    #end
+  #end
+#end
+
+/** 重置表单 */
+function resetForm() {
+  formData.value = {
+    #foreach ($column in $columns)
+      #if ($column.createOperation || $column.updateOperation)
+        #if ($column.htmlType == "checkbox")
+            $column.javaField: [],
+        #else
+            $column.javaField: undefined,
+        #end
+      #end
+    #end
+  };
+  formRef.value?.resetFields();
+}
+
+## 特殊：树表专属逻辑
+#if ( $table.templateType == 2 )
+/** 获得${table.classComment}树 */
+async function get${simpleClassName}Tree() {
+  ${classNameVar}Tree.value = []
+  const data = await get${simpleClassName}List({});
+  data.unshift({
+    id: 0,
+    name: '顶级${table.classComment}',
+  });
+    ${classNameVar}Tree.value = handleTree(data);
+}
+#end
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    await formRef.value?.validate();
+    ## 特殊：主子表专属逻辑
+    #if ( $table.templateType == 10 || $table.templateType == 12 )
+      #if ( $subTables && $subTables.size() > 0 )
+        // 校验子表单
+        #foreach ($subTable in $subTables)
+          #set ($index = $foreach.count - 1)
+          #set ($subClassNameVar = $subClassNameVars.get($index))
+          #if ($subTable.subJoinMany) ## 一对多
+            ## TODO 列表值校验？
+          #else
+            try {
+              await ${subClassNameVar}FormRef.value?.validate()
+            } catch (e) {
+              subTabsName.value = '${subClassNameVar}'
+              return
+            }
+          #end
+        #end
+      #end
+    #end
+    modalApi.lock();
+    // 提交表单
+    const data = formData.value as ${simpleClassName}Api.${simpleClassName};
+    ## 特殊：主子表专属逻辑
+    #if ( $table.templateType == 10 || $table.templateType == 12 )
+      #if ( $subTables && $subTables.size() > 0 )
+        // 拼接子表的数据
+        #foreach ($subTable in $subTables)
+          #set ($index = $foreach.count - 1)
+          #set ($subClassNameVar = $subClassNameVars.get($index))
+          #if ($subTable.subJoinMany)
+            data.${subClassNameVar}s = ${subClassNameVar}FormRef.value?.getData();
+          #else
+            data.${subClassNameVar} = ${subClassNameVar}FormRef.value?.getValues();
+          #end
+        #end
+      #end
+    #end
+    try {
+      await (formData.value?.id ? update${simpleClassName}(data) : create${simpleClassName}(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success({
+        content: $t('ui.actionMessage.operationSuccess'),
+      });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      resetForm()
+      return;
+    }
+    // 加载数据
+    let data = modalApi.getData<${simpleClassName}Api.${simpleClassName}>();
+    if (!data) {
+      return;
+    }
+    if (data.id) {
+      modalApi.lock();
+      try {
+        data = await get${simpleClassName}(data.id);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    formData.value = data;
+#if ( $table.templateType == 2 )
+    // 加载树数据
+    await get${simpleClassName}Tree()
+#end
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle">
+    <Form
+      ref="formRef"
+      :model="formData"
+      :rules="rules"
+      :label-col="{ span: 5 }"
+      :wrapper-col="{ span: 18 }"
+    >
+      #foreach($column in $columns)
+        #if ($column.createOperation || $column.updateOperation)
+          #set ($dictType = $column.dictType)
+          #set ($javaField = $column.javaField)
+          #set ($javaType = $column.javaType)
+          #set ($comment = $column.columnComment)
+          #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+            #set ($dictMethod = "number")
+          #elseif ($javaType == "String")
+            #set ($dictMethod = "string")
+          #elseif ($javaType == "Boolean")
+            #set ($dictMethod = "boolean")
+          #end
+          #if ( $table.templateType == 2 && $column.id == $treeParentColumn.id )
+            <Form.Item label="${comment}" name="${javaField}">
+              <TreeSelect
+                      v-model:value="formData.${javaField}"
+                      :treeData="${classNameVar}Tree"
+                #if ($treeNameColumn.javaField == "name")
+                      :fieldNames="{
+            label: 'name',
+            value: 'id',
+            children: 'children',
+          }"
+                #else
+                      :fieldNames="{
+                        label: '$treeNameColumn.javaField',
+                        value: 'id',
+                        children: 'children',
+                        }"
+                #end
+                      checkable
+                      treeDefaultExpandAll
+                      placeholder="请选择${comment}"
+              />
+            </Form.Item>
+          #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+            <Form.Item label="${comment}" name="${javaField}">
+              <Input v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
+            </Form.Item>
+          #elseif($column.htmlType == "imageUpload")## 图片上传
+            <Form.Item label="${comment}" name="${javaField}">
+              <ImageUpload v-model:value="formData.${javaField}" />
+            </Form.Item>
+          #elseif($column.htmlType == "fileUpload")## 文件上传
+            <Form.Item label="${comment}" name="${javaField}">
+              <FileUpload v-model:value="formData.${javaField}" />
+            </Form.Item>
+          #elseif($column.htmlType == "editor")## 文本编辑器
+            <Form.Item label="${comment}" name="${javaField}">
+              <RichTextarea v-model="formData.${javaField}" height="500px" />
+            </Form.Item>
+          #elseif($column.htmlType == "select")## 下拉框
+            <Form.Item label="${comment}" name="${javaField}">
+              <Select v-model:value="formData.${javaField}" placeholder="请选择${comment}">
+                #if ("" != $dictType)## 有数据字典
+                  <SelectOption
+                          v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                          :key="dict.value"
+                          :value="dict.value"
+                  >
+                    {{ dict.label }}
+                  </SelectOption>
+                #else##没数据字典
+                  <SelectOption label="请选择字典生成" value="" />
+                #end
+              </Select>
+            </Form.Item>
+          #elseif($column.htmlType == "checkbox")## 多选框
+            <Form.Item label="${comment}" name="${javaField}">
+              <CheckboxGroup v-model:value="formData.${javaField}">
+                #if ("" != $dictType)## 有数据字典
+                  <Checkbox
+                          v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                          :key="dict.value"
+                          :value="dict.value"
+                 >
+                    {{ dict.label }}
+                  </Checkbox>
+                #else##没数据字典
+                  <Checkbox label="请选择字典生成" />
+                #end
+              </CheckboxGroup>
+            </Form.Item>
+          #elseif($column.htmlType == "radio")## 单选框
+            <Form.Item label="${comment}" name="${javaField}">
+              <RadioGroup v-model:value="formData.${javaField}">
+                #if ("" != $dictType)## 有数据字典
+                  <Radio
+                          v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                          :key="dict.value"
+                          :value="dict.value"
+                  >
+                    {{ dict.label }}
+                  </Radio>
+                #else##没数据字典
+                  <Radio value="1">请选择字典生成</Radio>
+                #end
+              </RadioGroup>
+            </Form.Item>
+          #elseif($column.htmlType == "datetime")## 时间框
+            <Form.Item label="${comment}" name="${javaField}">
+              <DatePicker
+                      v-model:value="formData.${javaField}"
+                      valueFormat="x"
+                      placeholder="选择${comment}"
+              />
+            </Form.Item>
+          #elseif($column.htmlType == "textarea")## 文本框
+            <Form.Item label="${comment}" name="${javaField}">
+              <TextArea v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
+            </Form.Item>
+          #end
+        #end
+      #end
+    </Form>
+    ## 特殊：主子表专属逻辑
+    #if ( $table.templateType == 10 || $table.templateType == 12 )
+      <!-- 子表的表单 -->
+      <Tabs v-model:active-key="subTabsName">
+        #foreach ($subTable in $subTables)
+          #set ($index = $foreach.count - 1)
+          #set ($subClassNameVar = $subClassNameVars.get($index))
+          #set ($subSimpleClassName = $subSimpleClassNames.get($index))
+          #set ($subJoinColumn_strikeCase = $subJoinColumn_strikeCases.get($index))
+          <TabPane key="$subClassNameVar" tab="${subTable.classComment}" force-render>
+            <${subSimpleClassName}Form ref="${subClassNameVar}FormRef" :${subJoinColumn_strikeCase}="formData?.id" />
+          </TabPane>
+        #end
+      </Tabs>
+    #end
+  </Modal>
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/import.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/import.vue.vm
new file mode 100644
index 000000000..b6b8f797b
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/import.vue.vm
@@ -0,0 +1,71 @@
+<script lang="ts" setup>
+import type { FileType } from 'antdv-next/es/upload/interface';
+
+import { ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message, Upload } from 'antdv-next';
+
+import { import${simpleClassName}, import${simpleClassName}Template } from '#/api/${table.moduleName}/${table.businessName}';
+
+defineOptions({ name: '${simpleClassName}Import' });
+
+const emit = defineEmits(['success']);
+const fileRef = ref<File | null>(null);
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!fileRef.value) {
+      message.error('请上传文件');
+      return;
+    }
+    modalApi.lock();
+    try {
+      const formData = new FormData();
+      formData.append('file', fileRef.value);
+      const response: any = await import${simpleClassName}(formData);
+      const data = response?.data ?? response ?? {};
+      let text = '导入成功数量：' + (data.successCount || 0) + '；导入失败数量：' + (data.failureCount || 0) + '；';
+      if (data.failureRows) {
+        Object.keys(data.failureRows).forEach((rowNo) => {
+          text += '< 第' + rowNo + '行: ' + data.failureRows[rowNo] + ' >';
+        });
+      }
+      message.info(text);
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+
+/** 上传前：拦截 antd Upload 的自动上传，文件存到 ref */
+function beforeUpload(file: FileType) {
+  fileRef.value = file as unknown as File;
+  return false;
+}
+
+/** 下载导入模板 */
+async function handleDownload() {
+  const data = await import${simpleClassName}Template();
+  downloadFileFromBlobPart({ fileName: '${table.classComment}导入模板.xls', source: data });
+}
+</script>
+
+<template>
+  <Modal title="导入${table.classComment}" class="w-1/3">
+    <div class="mx-4">
+      <Upload :max-count="1" accept=".xls,.xlsx" :before-upload="beforeUpload">
+        <Button type="primary"> 选择 Excel 文件 </Button>
+      </Upload>
+    </div>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center">
+        <Button @click="handleDownload"> 下载导入模板 </Button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/index.vue.vm
new file mode 100644
index 000000000..166069d4e
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/index.vue.vm
@@ -0,0 +1,511 @@
+<script lang="ts" setup>
+import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
+
+import { ref, h, reactive, onMounted, nextTick } from 'vue';
+
+import { Page, useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { useTableToolbar, VbenVxeTableToolbar } from '@vben/plugins/vxe-table';
+import { cloneDeep, downloadFileFromBlobPart, formatDateTime, isEmpty } from '@vben/utils';
+import { Button, Card, message, Tabs, Pagination, Form, RangePicker, DatePicker, Select, Input } from 'antdv-next';
+import ${simpleClassName}Form from './modules/form.vue';
+import { Download, Plus, RefreshCw, Search, Trash2 } from '@vben/icons';
+import { DictTag } from '#/components/dict-tag';
+import { VxeColumn, VxeTable } from '#/adapter/vxe-table';
+import { getRangePickerDefaultProps } from '#/utils/rangePickerProps';
+
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 11 || $table.templateType == 12 )
+    #foreach ($subSimpleClassName in $subSimpleClassNames)
+    #set ($index = $foreach.count - 1)
+    #set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($index))
+    import ${subSimpleClassName}List from './modules/${subSimpleClassName_strikeCase}-list.vue'
+    #end
+#end
+
+import { $t } from '#/locales';
+#if (${table.templateType} == 2)## 树表接口
+import { handleTree } from '@vben/utils'
+import { get${simpleClassName}List, delete${simpleClassName}, export${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
+#else## 标准表接口
+import { get${simpleClassName}Page, delete${simpleClassName},#if ($deleteBatchEnable) delete${simpleClassName}List,#end export${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
+#end
+#if ($importEnable)
+import ${simpleClassName}Import from './modules/import-form.vue';
+#end
+
+#if ($table.templateType == 12 || $table.templateType == 11) ## 内嵌和erp情况
+/** 子表的列表 */
+const subTabsName = ref('$subClassNameVars.get(0)')
+#if ($table.templateType == 11)
+const select${simpleClassName} = ref<${simpleClassName}Api.${simpleClassName}>();
+async function onCellClick({ row }: { row: ${simpleClassName}Api.${simpleClassName} }) {
+  select${simpleClassName}.value = row
+}
+#end
+#end
+
+const loading = ref(true) // 列表的加载中
+#if ( $table.templateType == 2 )
+const list = ref<any[]>([]) // 树列表的数据
+#else
+const list = ref<${simpleClassName}Api.${simpleClassName}[]>([]) // 列表的数据
+#end
+
+## 特殊：树表专属逻辑（树不需要分页接口）
+#if ( $table.templateType != 2 )
+const total = ref(0) // 列表的总页数
+#end
+const queryParams = reactive({
+## 特殊：树表专属逻辑（树不需要分页接口）
+#if ( $table.templateType != 2 )
+  pageNo: 1,
+  pageSize: 10,
+#end
+#foreach ($column in $columns)
+    #if ($column.listOperation)
+        #if ($column.listOperationCondition != 'BETWEEN')
+                $column.javaField: undefined,
+        #end
+        #if ($column.htmlType == "datetime" || $column.listOperationCondition == "BETWEEN")
+                $column.javaField: undefined,
+        #end
+    #end
+#end
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+async function getList() {
+  loading.value = true
+  try {
+    const params = cloneDeep(queryParams) as any;
+      #foreach ($column in $columns)
+          #if ($column.listOperation)
+              #if ($column.htmlType == "datetime" || $column.listOperationCondition == "BETWEEN")
+                if (params.${column.javaField} && Array.isArray(params.${column.javaField})) {
+                  params.${column.javaField} = (params.${column.javaField} as string[]).join(',');
+                }
+              #end
+          #end
+      #end
+      ## 特殊：树表专属逻辑（树不需要分页接口）
+      #if ( $table.templateType == 2 )
+        list.value = await get${simpleClassName}List(params);
+      #else
+        const data = await get${simpleClassName}Page(params)
+        list.value = data.list
+        total.value = data.total
+      #end
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+#if ( $table.templateType != 2 )
+  queryParams.pageNo = 1
+#end
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: ${simpleClassName}Form,
+  destroyOnClose: true,
+});
+#if ($importEnable)
+const [ImportFormModal, importFormModalApi] = useVbenModal({
+  connectedComponent: ${simpleClassName}Import,
+  destroyOnClose: true,
+});
+
+/** 导入${table.classComment} */
+function handleImport() {
+  importFormModalApi.open();
+}
+#end
+
+/** 创建${table.classComment} */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑${table.classComment} */
+function handleEdit(row: ${simpleClassName}Api.${simpleClassName}) {
+  formModalApi.setData(row).open();
+}
+
+#if (${table.templateType} == 2)## 树表特有：新增下级
+/** 新增下级${table.classComment} */
+function handleAppend(row: ${simpleClassName}Api.${simpleClassName}) {
+  formModalApi.setData({ ${treeParentColumn.javaField}: row.id }).open();
+}
+#end
+
+/** 删除${table.classComment} */
+async function handleDelete(row: ${simpleClassName}Api.${simpleClassName}) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.id]),
+    duration: 0,
+  });
+  try {
+    await delete${simpleClassName}(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
+    await getList();
+  } finally {
+    hideLoading();
+  }
+}
+
+#if ($table.templateType != 2 && $deleteBatchEnable)
+/** 批量删除${table.classComment} */
+async function handleDeleteBatch() {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting'),
+    duration: 0,
+  });
+  try {
+    await delete${simpleClassName}List(checkedIds.value);
+    checkedIds.value = [];
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    await getList();
+  } finally {
+    hideLoading();
+  }
+}
+
+const checkedIds = ref<number[]>([])
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ${simpleClassName}Api.${simpleClassName}[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+#end
+
+/** 导出表格 */
+async function handleExport() {
+try {
+  exportLoading.value = true;
+  const data = await export${simpleClassName}(queryParams);
+  downloadFileFromBlobPart({ fileName: '${table.classComment}.xls', source: data });
+}finally {
+  exportLoading.value = false;
+}
+}
+
+
+#if (${table.templateType} == 2)
+/** 切换树形展开/收缩状态 */
+const isExpanded = ref(true);
+function handleExpand() {
+  isExpanded.value = !isExpanded.value;
+  tableRef.value?.setAllTreeExpand(isExpanded.value);
+}
+#end
+
+/** 初始化 */
+const { hiddenSearchBar, tableToolbarRef, tableRef } = useTableToolbar();
+onMounted(() => {
+  getList();
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <FormModal @success="getList" />
+#if ($importEnable)
+    <ImportFormModal @success="getList" />
+#end
+
+    <Card v-if="!hiddenSearchBar" class="mb-4">
+      <!-- 搜索工作栏 -->
+      <Form
+          :model="queryParams"
+          ref="queryFormRef"
+          layout="inline"
+      >
+          #foreach($column in $columns)
+              #if ($column.listOperation)
+                  #set ($dictType = $column.dictType)
+                  #set ($javaField = $column.javaField)
+                  #set ($javaType = $column.javaType)
+                  #set ($comment = $column.columnComment)
+                  #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                      #set ($dictMethod = "number")
+                  #elseif ($javaType == "String")
+                      #set ($dictMethod = "string")
+                  #elseif ($javaType == "Boolean")
+                      #set ($dictMethod = "boolean")
+                  #end
+                  #if ($column.htmlType == "input")
+                    <Form.Item label="${comment}" name="${javaField}">
+                      <Input
+                          v-model:value="queryParams.${javaField}"
+                          placeholder="请输入${comment}"
+                          allowClear
+                          @pressEnter="handleQuery"
+                           class="w-full"
+                      />
+                    </Form.Item>
+                  #elseif ($column.htmlType == "select" || $column.htmlType == "radio" || $column.htmlType == "checkbox")
+                    <Form.Item label="${comment}" name="${javaField}">
+                      <Select
+                          v-model:value="queryParams.${javaField}"
+                          placeholder="请选择${comment}"
+                          allowClear
+                           class="w-full"
+                      >
+                          #if ("" != $dictType)## 设置了 dictType 数据字典的情况
+                            <SelectOption
+                                v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                                :key="dict.value"
+                                :value="dict.value"
+                            >
+                              {{ dict.label }}
+                            </SelectOption>
+                          #else## 未设置 dictType 数据字典的情况
+                            <SelectOption label="请选择字典生成" value="" />
+                          #end
+                      </Select>
+                    </Form.Item>
+                  #elseif($column.htmlType == "datetime")
+                      #if ($column.listOperationCondition != "BETWEEN")## 非范围
+                        <Form.Item label="${comment}" name="${javaField}">
+                          <DatePicker
+                              v-model:value="queryParams.${javaField}"
+                              valueFormat="YYYY-MM-DD"
+                              placeholder="选择${comment}"
+                              allowClear
+                               class="w-full"
+                          />
+                        </Form.Item>
+                      #else## 范围
+                        <Form.Item label="${comment}" name="${javaField}">
+                          <RangePicker
+                              v-model:value="queryParams.${javaField}"
+                              v-bind="getRangePickerDefaultProps()"
+                              class="w-full"
+                          />
+                        </Form.Item>
+                      #end
+                  #end
+              #end
+          #end
+        <Form.Item>
+          <Button class="ml-2" @click="resetQuery"> 重置 </Button>
+          <Button class="ml-2" @click="handleQuery" type="primary">
+            搜索
+          </Button>
+        </Form.Item>
+      </Form>
+    </Card>
+
+    <!-- 列表 -->
+    <Card title="${table.classComment}">
+      <template #extra>
+        <VbenVxeTableToolbar
+            ref="tableToolbarRef"
+            v-model:hidden-search="hiddenSearchBar"
+        >
+        #if (${table.templateType} == 2)
+          <Button @click="handleExpand" class="mr-2">
+            {{ isExpanded ? '收缩' : '展开' }}
+          </Button>
+        #end
+          <Button
+              class="ml-2"
+              :icon="h(Plus)"
+              type="primary"
+              @click="handleCreate"
+              v-access:code="['${permissionPrefix}:create']"
+          >
+            {{ $t('ui.actionTitle.create', ['${table.classComment}']) }}
+          </Button>
+#if ($importEnable)
+          <Button
+              class="ml-2"
+              type="primary"
+              @click="handleImport"
+              v-access:code="['${permissionPrefix}:import']"
+          >
+            导入
+          </Button>
+#end
+          <Button
+              :icon="h(Download)"
+              type="primary"
+              class="ml-2"
+              :loading="exportLoading"
+              @click="handleExport"
+              v-access:code="['${permissionPrefix}:export']"
+          >
+            {{ $t('ui.actionTitle.export') }}
+          </Button>
+        #if ($table.templateType != 2 && $deleteBatchEnable)
+          <Button
+              :icon="h(Trash2)"
+              type="primary"
+              danger
+              class="ml-2"
+              :disabled="isEmpty(checkedIds)"
+              @click="handleDeleteBatch"
+              v-access:code="['${table.moduleName}:${simpleClassName_strikeCase}:delete']"
+          >
+            批量删除
+          </Button>
+        #end
+        </VbenVxeTableToolbar>
+      </template>
+      <VxeTable
+          ref="tableRef"
+          :data="list"
+        #if ( $table.templateType == 2 )
+          :tree-config="{
+          parentField: '${treeParentColumn.javaField}',
+          rowField: 'id',
+          transform: true,
+          expandAll: true,
+          reserve: true,
+        }"
+        #end
+#if ($table.templateType == 11) ## erp情况
+          @cell-click="onCellClick"
+          :row-config="{
+            keyField: 'id',
+            isHover: true,
+            isCurrent: true,
+          }"
+#end
+          show-overflow
+          :loading="loading"
+#if ($table.templateType != 2 && $deleteBatchEnable)
+          @checkboxAll="handleRowCheckboxChange"
+          @checkboxChange="handleRowCheckboxChange"
+#end
+      >
+#if ($table.templateType != 2 && $deleteBatchEnable)
+        <VxeColumn type="checkbox" width="40" />
+#end
+          ## 特殊：主子表专属逻辑
+          #if ( $table.templateType == 12 && $subTables && $subTables.size() > 0 )
+            <!-- 子表的列表 -->
+            <VxeColumn type="expand" width="60">
+              <template #content="{ row }">
+                <!-- 子表的表单 -->
+                <Tabs v-model:active-key="subTabsName" class="mx-8">
+                    #foreach ($subTable in $subTables)
+                        #set ($index = $foreach.count - 1)
+                        #set ($subClassNameVar = $subClassNameVars.get($index))
+                        #set ($subSimpleClassName = $subSimpleClassNames.get($index))
+                        #set ($subJoinColumn_strikeCase = $subJoinColumn_strikeCases.get($index))
+                      <TabPane key="$subClassNameVar" tab="${subTable.classComment}" force-render>
+                        <${subSimpleClassName}List :${subJoinColumn_strikeCase}="row?.id" />
+                      </TabPane>
+                    #end
+                </Tabs>
+              </template>
+            </VxeColumn>
+          #end
+          #foreach($column in $columns)
+              #if ($column.listOperationResult)
+                  #set ($dictType=$column.dictType)
+                  #set ($javaField = $column.javaField)
+                  #set ($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                  #set ($comment=$column.columnComment)
+                  #if ($column.javaType == "LocalDateTime")## 时间类型
+                    <VxeColumn field="${javaField}" title="${comment}" align="center">
+                      <template #default="{row}">
+                        {{formatDateTime(row.${javaField})}}
+                      </template>
+                    </VxeColumn>
+                  #elseif($column.dictType && "" != $column.dictType)## 数据字典
+                    <VxeColumn field="${javaField}" title="${comment}" align="center">
+                      <template #default="{row}">
+                        <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="row.${javaField}" />
+                      </template>
+                    </VxeColumn>
+                  #elseif ($table.templateType == 2 && $javaField == $treeNameColumn.javaField)
+                    <VxeColumn field="${javaField}" title="${comment}" align="center"  tree-node/>
+                  #else
+                    <VxeColumn field="${javaField}" title="${comment}" align="center" />
+                  #end
+              #end
+          #end
+        <VxeColumn field="operation" title="操作" align="center">
+          <template #default="{row}">
+#if ( $table.templateType == 2 )
+  <Button
+      size="small"
+      type="link"
+      @click="handleAppend(row)"
+      v-access:code="['${permissionPrefix}:create']"
+  >
+    新增下级
+  </Button>
+#end
+            <Button
+                size="small"
+                type="link"
+                @click="handleEdit(row)"
+                v-access:code="['${permissionPrefix}:update']"
+            >
+              {{ $t('ui.actionTitle.edit') }}
+            </Button>
+            <Button
+                size="small"
+                type="link"
+                danger
+                class="ml-2"
+                #if ( $table.templateType == 2 )
+                :disabled="!isEmpty(row?.children)"
+                #end
+                @click="handleDelete(row)"
+                v-access:code="['${permissionPrefix}:delete']"
+            >
+              {{ $t('ui.actionTitle.delete') }}
+            </Button>
+          </template>
+        </VxeColumn>
+      </VxeTable>
+#if ( $table.templateType != 2 )
+      <!-- 分页 -->
+      <div class="mt-2 flex justify-end">
+        <Pagination
+            :total="total"
+            v-model:current="queryParams.pageNo"
+            v-model:page-size="queryParams.pageSize"
+            show-size-changer
+            @change="getList"
+        />
+      </div>
+#end
+    </Card>
+#if ($table.templateType == 11) ## erp情况
+  <Card>
+    <!-- 子表的表单 -->
+    <Tabs v-model:active-key="subTabsName">
+        #foreach ($subTable in $subTables)
+            #set ($index = $foreach.count - 1)
+            #set ($subClassNameVar = $subClassNameVars.get($index))
+            #set ($subSimpleClassName = $subSimpleClassNames.get($index))
+            #set ($subJoinColumn_strikeCase = $subJoinColumn_strikeCases.get($index))
+          <TabPane key="$subClassNameVar" tab="${subTable.classComment}" force-render>
+            <${subSimpleClassName}List :${subJoinColumn_strikeCase}="select${simpleClassName}?.id" />
+          </TabPane>
+        #end
+    </Tabs>
+  </Card>
+#end
+  </Page>
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_erp.vue.vm
new file mode 100644
index 000000000..0cb89f473
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_erp.vue.vm
@@ -0,0 +1,213 @@
+#set ($subTable = $subTables.get($subIndex))##当前表
+#set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组
+#set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
+#set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
+<script lang="ts" setup>
+import type { Rule } from 'antdv-next/es/form';
+import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { Tinymce as RichTextarea } from '#/components/tinymce';
+import { ImageUpload, FileUpload } from "#/components/upload";
+import { message, Tabs, Form, Input, TextArea, Select, RadioGroup, Radio, CheckboxGroup, Checkbox, DatePicker, TreeSelect } from 'antdv-next';
+
+import { $t } from '#/locales';
+
+import { get${subSimpleClassName}, create${subSimpleClassName}, update${subSimpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
+
+const emit = defineEmits(['success']);
+const getTitle = computed(() => {
+  return formData.value?.id
+      ? $t('ui.actionTitle.edit', ['${subTable.classComment}'])
+      : $t('ui.actionTitle.create', ['${subTable.classComment}']);
+});
+
+const formRef = ref();
+const formData = ref<Partial<${simpleClassName}Api.${subSimpleClassName}>>({
+  #foreach ($column in $subColumns)
+    #if ($column.createOperation || $column.updateOperation)
+      #if ($column.htmlType == "checkbox")
+          $column.javaField: [],
+      #else
+          $column.javaField: undefined,
+      #end
+    #end
+  #end
+});
+const rules: Record<string, Rule[]> = {
+  #foreach ($column in $subColumns)
+    #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+      #set($comment=$column.columnComment)
+        $column.javaField: [{ required: true, message: '${comment}不能为空', trigger: #if($column.htmlType == 'select')'change'#else'blur'#end }],
+    #end
+  #end
+};
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    await formRef.value?.validate();
+
+    modalApi.lock();
+    // 提交表单
+    const data = formData.value as ${simpleClassName}Api.${subSimpleClassName};
+    try {
+      await (formData.value?.id ? update${subSimpleClassName}(data) : create${subSimpleClassName}(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success({
+        content: $t('ui.actionMessage.operationSuccess'),
+      });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      resetForm()
+      return;
+    }
+
+    // 加载数据
+    let data = modalApi.getData<${simpleClassName}Api.${subSimpleClassName}>();
+    if (!data) {
+      return;
+    }
+    if (data.id) {
+      modalApi.lock();
+      try {
+        data = await get${subSimpleClassName}(data.id);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    // 设置到 values
+    formData.value = data;
+  },
+});
+
+/** 重置表单 */
+function resetForm(){
+  formData.value = {
+    #foreach ($column in $subColumns)
+      #if ($column.createOperation || $column.updateOperation)
+        #if ($column.htmlType == "checkbox")
+            $column.javaField: [],
+        #else
+            $column.javaField: undefined,
+        #end
+      #end
+    #end
+  };
+  formRef.value?.resetFields();
+}
+</script>
+
+<template>
+  <Modal :title="getTitle">
+    <Form
+      ref="formRef"
+      :model="formData"
+      :rules="rules"
+      :label-col="{ span: 5 }"
+      :wrapper-col="{ span: 18 }"
+    >
+      #foreach($column in $subColumns)
+        #if ($column.createOperation || $column.updateOperation)
+          #set ($dictType = $column.dictType)
+          #set ($javaField = $column.javaField)
+          #set ($javaType = $column.javaType)
+          #set ($comment = $column.columnComment)
+          #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+            #set ($dictMethod = "number")
+          #elseif ($javaType == "String")
+            #set ($dictMethod = "string")
+          #elseif ($javaType == "Boolean")
+            #set ($dictMethod = "boolean")
+          #end
+          #if ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+            <Form.Item label="${comment}" name="${javaField}">
+              <Input v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
+            </Form.Item>
+          #elseif($column.htmlType == "imageUpload")## 图片上传
+            <Form.Item label="${comment}" name="${javaField}">
+              <ImageUpload v-model:value="formData.${javaField}" />
+            </Form.Item>
+          #elseif($column.htmlType == "fileUpload")## 文件上传
+            <Form.Item label="${comment}" name="${javaField}">
+              <FileUpload v-model:value="formData.${javaField}" />
+            </Form.Item>
+          #elseif($column.htmlType == "editor")## 文本编辑器
+            <Form.Item label="${comment}" name="${javaField}">
+              <RichTextarea v-model="formData.${javaField}" height="500px" />
+            </Form.Item>
+          #elseif($column.htmlType == "select")## 下拉框
+            <Form.Item label="${comment}" name="${javaField}">
+              <Select v-model:value="formData.${javaField}" placeholder="请选择${comment}">
+                #if ("" != $dictType)## 有数据字典
+                  <SelectOption
+                          v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                          :key="dict.value"
+                          :value="dict.value"
+                  >
+                    {{ dict.label }}
+                  </SelectOption>
+                #else##没数据字典
+                  <SelectOption label="请选择字典生成" value="" />
+                #end
+              </Select>
+            </Form.Item>
+          #elseif($column.htmlType == "checkbox")## 多选框
+            <Form.Item label="${comment}" name="${javaField}">
+              <CheckboxGroup v-model:value="formData.${javaField}">
+                #if ("" != $dictType)## 有数据字典
+                  <Checkbox
+                          v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                          :key="dict.value"
+                          :value="dict.value"
+                  >
+                    {{ dict.label }}
+                  </Checkbox>
+                #else##没数据字典
+                  <Checkbox label="请选择字典生成" />
+                #end
+              </CheckboxGroup>
+            </Form.Item>
+          #elseif($column.htmlType == "radio")## 单选框
+            <Form.Item label="${comment}" name="${javaField}">
+              <RadioGroup v-model:value="formData.${javaField}">
+                #if ("" != $dictType)## 有数据字典
+                  <Radio
+                          v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                          :key="dict.value"
+                          :value="dict.value"
+                  >
+                    {{ dict.label }}
+                  </Radio>
+                #else##没数据字典
+                  <Radio value="1">请选择字典生成</Radio>
+                #end
+              </RadioGroup>
+            </Form.Item>
+          #elseif($column.htmlType == "datetime")## 时间框
+            <Form.Item label="${comment}" name="${javaField}">
+              <DatePicker
+                      v-model:value="formData.${javaField}"
+                      valueFormat="x"
+                      placeholder="选择${comment}"
+              />
+            </Form.Item>
+          #elseif($column.htmlType == "textarea")## 文本框
+            <Form.Item label="${comment}" name="${javaField}">
+              <TextArea v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
+            </Form.Item>
+          #end
+        #end
+      #end
+    </Form>
+  </Modal>
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_inner.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_inner.vue.vm
new file mode 100644
index 000000000..7f0ec3a1e
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_inner.vue.vm
@@ -0,0 +1,2 @@
+## 主表的 normal 和 inner 使用相同的 form 表单
+#parse("codegen/vue3_vben5_antd/general/views/modules/form_sub_normal.vue.vm")
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_normal.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_normal.vue.vm
new file mode 100644
index 000000000..e788e4c8a
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_normal.vue.vm
@@ -0,0 +1,347 @@
+#set ($subTable = $subTables.get($subIndex))##当前表
+#set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组
+#set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
+#set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
+#set ($subClassNameVar = $subClassNameVars.get($subIndex))
+#set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+<script lang="ts" setup>
+import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
+
+import { computed, ref, h, onMounted, watch, nextTick } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { message, Tabs, Form, Input, TextArea, Button, Select, RadioGroup, Radio, CheckboxGroup, Checkbox, DatePicker } from 'antdv-next';
+import { $t } from '#/locales';
+
+#if ($subTable.subJoinMany) ## 一对多
+import type { VxeTableInstance } from '#/adapter/vxe-table';
+import { Plus } from "@vben/icons";
+import { VxeColumn, VxeTable } from '#/adapter/vxe-table';
+import { ImageUpload, FileUpload } from "#/components/upload";
+import { get${subSimpleClassName}ListBy${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
+#else
+import type { Rule } from 'antdv-next/es/form';
+import { Tinymce as RichTextarea } from '#/components/tinymce';
+import { ImageUpload, FileUpload } from "#/components/upload";
+import { get${subSimpleClassName}By${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
+#end
+
+const props = defineProps<{
+   ${subJoinColumn.javaField}?: number // ${subJoinColumn.columnComment}（主表的关联字段）
+}>()
+
+#if ($subTable.subJoinMany) ## 一对多
+const list = ref<${simpleClassName}Api.${subSimpleClassName}[]>([]) // 列表的数据
+const tableRef = ref<VxeTableInstance>();
+
+/** 添加${subTable.classComment} */
+async function handleAdd() {
+  await tableRef.value?.insertAt({} as ${simpleClassName}Api.${subSimpleClassName}, -1);
+}
+
+/** 删除${subTable.classComment} */
+async function handleDelete(row: ${simpleClassName}Api.${subSimpleClassName}) {
+  await tableRef.value?.remove(row);
+}
+
+/** 提供获取表格数据的方法供父组件调用 */
+defineExpose({
+  getData: (): ${simpleClassName}Api.${subSimpleClassName}[] => {
+    const data = list.value as ${simpleClassName}Api.${subSimpleClassName}[];
+    const removeRecords = tableRef.value?.getRemoveRecords() as ${simpleClassName}Api.${subSimpleClassName}[];
+    const insertRecords = tableRef.value?.getInsertRecords() as ${simpleClassName}Api.${subSimpleClassName}[];
+    return [
+      ...data.filter(
+        (row) => !removeRecords.some((removed) => removed.id === row.id),
+      ),
+      ...insertRecords.map((row: any) => ({ ...row, id: undefined })),
+    ];
+  },
+});
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+    () => props.${subJoinColumn.javaField},
+    async (val) => {
+      if (!val) {
+        return;
+      }
+      list.value = await get${subSimpleClassName}ListBy${SubJoinColumnName}(props.${subJoinColumn.javaField}!);
+    },
+    { immediate: true },
+);
+#else
+const formRef = ref();
+const formData = ref<Partial<${simpleClassName}Api.${subSimpleClassName}>>({
+    #foreach ($column in $subColumns)
+        #if ($column.createOperation || $column.updateOperation)
+            #if ($column.htmlType == "checkbox")
+                    $column.javaField: [],
+            #else
+                    $column.javaField: undefined,
+            #end
+        #end
+    #end
+});
+const rules: Record<string, Rule[]> = {
+    #foreach ($column in $subColumns)
+        #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+            #set($comment=$column.columnComment)
+                $column.javaField: [{ required: true, message: '${comment}不能为空', trigger: #if($column.htmlType == 'select')'change'#else'blur'#end }],
+        #end
+    #end
+};
+/** 暴露出表单校验方法和表单值获取方法 */
+defineExpose({
+  validate: async () => await formRef.value?.validate(),
+  getValues: ()=> formData.value,
+});
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+    () => props.${subJoinColumn.javaField},
+    async (val) => {
+      if (!val) {
+        return;
+      }
+      await nextTick();
+      formData.value = await get${subSimpleClassName}By${SubJoinColumnName}(props.${subJoinColumn.javaField}!);
+    },
+    { immediate: true },
+);
+#end
+</script>
+
+<template>
+#if ($subTable.subJoinMany) ## 一对多
+  <VxeTable ref="tableRef" :data="list" show-overflow class="mx-4">
+      #foreach($column in $subColumns)
+          #if ($column.createOperation || $column.updateOperation)
+              #set ($comment = $column.columnComment)
+              #set ($javaField = $column.javaField)
+              #set ($javaType = $column.javaType)
+              #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                  #set ($dictMethod = "number")
+              #elseif ($javaType == "String")
+                  #set ($dictMethod = "string")
+              #elseif ($javaType == "Boolean")
+                  #set ($dictMethod = "boolean")
+              #end
+              #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+              #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+                <VxeColumn field="${javaField}" title="${comment}" align="center">
+                  <template #default="{ row }">
+                    <Input v-model:value="row.${javaField}" />
+                  </template>
+                </VxeColumn>
+              #elseif($column.htmlType == "imageUpload")## 图片上传
+                <VxeColumn field="${javaField}" title="${comment}" align="center">
+                  <template #default="{ row }">
+                    <ImageUpload v-model:value="row.${javaField}" />
+                  </template>
+                </VxeColumn>
+              #elseif($column.htmlType == "fileUpload")## 文件上传
+                <VxeColumn field="${javaField}" title="${comment}" align="center">
+                  <template #default="{ row }">
+                    <FileUpload v-model:value="row.${javaField}" />
+                  </template>
+                </VxeColumn>
+              #elseif($column.htmlType == "select")## 下拉框
+                <VxeColumn field="${javaField}" title="${comment}" align="center">
+                  <template #default="{ row }">
+                    <Select v-model:value="row.${javaField}" placeholder="请选择${comment}">
+                        #if ("" != $dictType)## 有数据字典
+                          <SelectOption
+                              v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                              :key="dict.value"
+                              :value="dict.value"
+                          >
+                            {{ dict.label }}
+                          </SelectOption>
+                        #else##没数据字典
+                          <SelectOption label="请选择字典生成" value="" />
+                        #end
+                    </Select>
+                  </template>
+                </VxeColumn>
+              #elseif($column.htmlType == "checkbox")## 多选框
+                <VxeColumn field="${javaField}" title="${comment}" align="center">
+                  <template #default="{ row }">
+                    <CheckboxGroup v-model:value="row.${javaField}">
+                        #if ("" != $dictType)## 有数据字典
+                          <Checkbox
+                              v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                              :key="dict.value"
+                              :value="dict.value"
+                          >
+                            {{ dict.label }}
+                          </Checkbox>
+                        #else##没数据字典
+                          <Checkbox label="请选择字典生成" />
+                        #end
+                    </CheckboxGroup>
+                  </template>
+                </VxeColumn>
+              #elseif($column.htmlType == "radio")## 单选框
+                <VxeColumn field="${javaField}" title="${comment}" align="center">
+                  <template #default="{ row }">
+                    <RadioGroup v-model:value="row.${javaField}">
+                        #if ("" != $dictType)## 有数据字典
+                          <Radio
+                              v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                              :key="dict.value"
+                              :value="dict.value"
+                          >
+                            {{ dict.label }}
+                          </Radio>
+                        #else##没数据字典
+                          <Radio value="1">请选择字典生成</Radio>
+                        #end
+                    </RadioGroup>
+                  </template>
+                </VxeColumn>
+              #elseif($column.htmlType == "datetime")## 时间框
+                <VxeColumn field="${javaField}" title="${comment}" align="center">
+                  <template #default="{ row }">
+                    <DatePicker
+                        v-model:value="row.${javaField}"
+                        :showTime="true"
+                        format="YYYY-MM-DD HH:mm:ss"
+                        valueFormat='x'
+                    />
+                  </template>
+                </VxeColumn>
+              #elseif($column.htmlType == "textarea" || $column.htmlType == "editor")## 文本框
+                <VxeColumn field="${javaField}" title="${comment}" align="center">
+                  <template #default="{ row }">
+                    <TextArea v-model:value="row.${javaField}" />
+                  </template>
+                </VxeColumn>
+              #end
+          #end
+      #end
+    <VxeColumn field="operation" title="操作" align="center">
+      <template #default="{ row }">
+        <Button
+            size="small"
+            type="link"
+            danger
+            @click="handleDelete(row)"
+            v-access:code="['${permissionPrefix}:delete']"
+        >
+          {{ $t('ui.actionTitle.delete') }}
+        </Button>
+      </template>
+    </VxeColumn>
+  </VxeTable>
+  <div class="flex justify-center mt-4">
+    <Button :icon="h(Plus)" type="primary" ghost @click="handleAdd" v-access:code="['${permissionPrefix}:create']">
+      {{ $t('ui.actionTitle.create', ['${subTable.classComment}']) }}
+    </Button>
+  </div>
+#else
+  <Form
+      ref="formRef"
+      class="mx-4"
+      :model="formData"
+      :rules="rules"
+      :label-col="{ span: 5 }"
+      :wrapper-col="{ span: 18 }"
+  >
+      #foreach($column in $subColumns)
+          #if ($column.createOperation || $column.updateOperation)
+              #set ($dictType = $column.dictType)
+              #set ($javaField = $column.javaField)
+              #set ($javaType = $column.javaType)
+              #set ($comment = $column.columnComment)
+              #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                  #set ($dictMethod = "number")
+              #elseif ($javaType == "String")
+                  #set ($dictMethod = "string")
+              #elseif ($javaType == "Boolean")
+                  #set ($dictMethod = "boolean")
+              #end
+              #if ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+                <Form.Item label="${comment}" name="${javaField}">
+                  <Input v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
+                </Form.Item>
+              #elseif($column.htmlType == "imageUpload")## 图片上传
+                <Form.Item label="${comment}" name="${javaField}">
+                  <ImageUpload v-model:value="formData.${javaField}" />
+                </Form.Item>
+              #elseif($column.htmlType == "fileUpload")## 文件上传
+                <Form.Item label="${comment}" name="${javaField}">
+                  <FileUpload v-model:value="formData.${javaField}" />
+                </Form.Item>
+              #elseif($column.htmlType == "editor")## 文本编辑器
+                <Form.Item label="${comment}" name="${javaField}">
+                  <RichTextarea v-model="formData.${javaField}" height="500px" />
+                </Form.Item>
+              #elseif($column.htmlType == "select")## 下拉框
+                <Form.Item label="${comment}" name="${javaField}">
+                  <Select v-model:value="formData.${javaField}" placeholder="请选择${comment}">
+                      #if ("" != $dictType)## 有数据字典
+                        <SelectOption
+                            v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                            :key="dict.value"
+                            :value="dict.value"
+                        >
+                          {{ dict.label }}
+                        </SelectOption>
+                      #else##没数据字典
+                        <SelectOption label="请选择字典生成" value="" />
+                      #end
+                  </Select>
+                </Form.Item>
+              #elseif($column.htmlType == "checkbox")## 多选框
+                <Form.Item label="${comment}" name="${javaField}">
+                  <CheckboxGroup v-model:value="formData.${javaField}">
+                      #if ("" != $dictType)## 有数据字典
+                        <Checkbox
+                            v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                            :key="dict.value"
+                            :value="dict.value"
+                        >
+                          {{ dict.label }}
+                        </Checkbox>
+                      #else##没数据字典
+                        <Checkbox label="请选择字典生成" />
+                      #end
+                  </CheckboxGroup>
+                </Form.Item>
+              #elseif($column.htmlType == "radio")## 单选框
+                <Form.Item label="${comment}" name="${javaField}">
+                  <RadioGroup v-model:value="formData.${javaField}">
+                      #if ("" != $dictType)## 有数据字典
+                        <Radio
+                            v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                            :key="dict.value"
+                            :value="dict.value"
+                        >
+                          {{ dict.label }}
+                        </Radio>
+                      #else##没数据字典
+                        <Radio value="1">请选择字典生成</Radio>
+                      #end
+                  </RadioGroup>
+                </Form.Item>
+              #elseif($column.htmlType == "datetime")## 时间框
+                <Form.Item label="${comment}" name="${javaField}">
+                  <DatePicker
+                      v-model:value="formData.${javaField}"
+                      valueFormat="x"
+                      placeholder="选择${comment}"
+                  />
+                </Form.Item>
+              #elseif($column.htmlType == "textarea")## 文本框
+                <Form.Item label="${comment}" name="${javaField}">
+                  <TextArea v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
+                </Form.Item>
+              #end
+          #end
+      #end
+  </Form>
+#end
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_erp.vue.vm
new file mode 100644
index 000000000..239aa2623
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_erp.vue.vm
@@ -0,0 +1,424 @@
+#set ($subTable = $subTables.get($subIndex))##当前表
+#set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组
+#set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
+#set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
+#set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
+#set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($subIndex))
+#set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+<script lang="ts" setup>
+import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
+import type { VxeTableInstance } from '#/adapter/vxe-table';
+
+import { reactive, ref, h, nextTick, watch, onMounted } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { DictTag } from '#/components/dict-tag';
+import { getRangePickerDefaultProps } from '#/utils/rangePickerProps';
+import { VxeColumn, VxeTable } from '#/adapter/vxe-table';
+import { formatDateTime } from '@vben/utils';
+
+#if ($table.templateType == 11) ## erp
+import { useVbenModal } from '@vben/common-ui';
+import { useTableToolbar, VbenVxeTableToolbar } from '@vben/plugins/vxe-table';
+import ${subSimpleClassName}Form from './${subSimpleClassName_strikeCase}-form.vue'
+import { Tinymce as RichTextarea } from '#/components/tinymce';
+import { ImageUpload, FileUpload } from "#/components/upload";
+import { message, Button, Card, Tabs, Pagination, Form, Input, TextArea, Select, RadioGroup, Radio, CheckboxGroup, Checkbox, RangePicker, DatePicker, TreeSelect } from 'antdv-next';
+import { Plus, Trash2 } from '@vben/icons';
+import { $t } from '#/locales';
+#end
+
+#if ($table.templateType == 11) ## erp
+import { delete${subSimpleClassName},#if ($deleteBatchEnable) delete${subSimpleClassName}List,#end get${subSimpleClassName}Page } from '#/api/${table.moduleName}/${table.businessName}';
+import { isEmpty, cloneDeep } from '@vben/utils';
+#else
+#if ($subTable.subJoinMany) ## 一对多
+import { get${subSimpleClassName}ListBy${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
+#else
+import { get${subSimpleClassName}By${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
+#end
+#end
+
+const props = defineProps<{
+  ${subJoinColumn.javaField}?: number // ${subJoinColumn.columnComment}（主表的关联字段）
+}>()
+
+#if ($table.templateType == 11) ## erp
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: ${subSimpleClassName}Form,
+  destroyOnClose: true,
+});
+
+/** 创建${subTable.classComment} */
+function handleCreate() {
+  if (!props.${subJoinColumn.javaField}){
+    message.warning("请先选择一个${table.classComment}!")
+    return
+  }
+  formModalApi.setData({${subJoinColumn.javaField}: props.${subJoinColumn.javaField}}).open();
+}
+
+/** 编辑${subTable.classComment} */
+function handleEdit(row: ${simpleClassName}Api.${subSimpleClassName}) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除${subTable.classComment} */
+async function handleDelete(row: ${simpleClassName}Api.${subSimpleClassName}) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.id]),
+    duration: 0,
+  });
+  try {
+    await delete${subSimpleClassName}(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
+    await getList();
+  } finally {
+    hideLoading();
+  }
+}
+
+#if ($deleteBatchEnable)
+/** 批量删除${subTable.classComment} */
+async function handleDeleteBatch() {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting'),
+    duration: 0,
+  });
+  try {
+    await delete${subSimpleClassName}List(checkedIds.value);
+    checkedIds.value = [];
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    await getList();
+  } finally {
+    hideLoading();
+  }
+}
+
+const checkedIds = ref<number[]>([])
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ${simpleClassName}Api.${subSimpleClassName}[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+#end
+#end
+
+const loading = ref(true) // 列表的加载中
+const list = ref<${simpleClassName}Api.${subSimpleClassName}[]>([]) // 列表的数据
+#if ($table.templateType == 11) ## erp
+const total = ref(0) // 列表的总页数
+#end
+#if ($table.templateType == 11) ## erp
+const queryFormRef = ref() // 搜索的表单
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  #foreach ($column in $subColumns)
+    #if ($column.listOperation)
+      #if ($column.listOperationCondition != 'BETWEEN')
+            $column.javaField: undefined,
+      #end
+      #if ($column.htmlType == "datetime" || $column.listOperationCondition == "BETWEEN")
+            $column.javaField: undefined,
+      #end
+    #end
+  #end
+})
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+#end
+  /** 查询列表 */
+async function getList() {
+  loading.value = true
+  try {
+    if (!props.${subJoinColumn.javaField}){
+      return []
+    }
+      ## 特殊：树表专属逻辑（树不需要分页接口）
+      #if ($table.templateType == 11) ## erp
+        const params = cloneDeep(queryParams) as any;
+          #foreach ($column in $columns)
+              #if ($column.listOperation)
+                  #if ($column.htmlType == "datetime" || $column.listOperationCondition == "BETWEEN")
+                    if (params.${column.javaField} && Array.isArray(params.${column.javaField})) {
+                      params.${column.javaField} = (params.${column.javaField} as string[]).join(',');
+                    }
+                  #end
+              #end
+          #end
+        params.${subJoinColumn.javaField} = props.${subJoinColumn.javaField};
+        const data = await get${subSimpleClassName}Page(params)
+        list.value = data.list
+        total.value = data.total
+      #else
+          #if ($subTable.subJoinMany) ## 一对多
+           list.value = await get${subSimpleClassName}ListBy${SubJoinColumnName}(props.${subJoinColumn.javaField}!);
+          #else
+           list.value = [await get${subSimpleClassName}By${SubJoinColumnName}(props.${subJoinColumn.javaField}!)];
+          #end
+      #end
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.${subJoinColumn.javaField},
+  async (val) => {
+    if (!val) {
+      return;
+    }
+    await nextTick();
+    await getList()
+  },
+  { immediate: true },
+);
+
+#if ($table.templateType == 11) ## erp
+/** 初始化 */
+const { hiddenSearchBar, tableToolbarRef, tableRef } = useTableToolbar();
+onMounted(() => {
+  getList();
+});
+#end
+</script>
+
+<template>
+    #if ($table.templateType == 11) ## erp
+      <FormModal @success="getList" />
+      <div class="h-[600px]">
+        <Card v-if="!hiddenSearchBar" class="mb-4">
+          <!-- 搜索工作栏 -->
+          <Form
+              :model="queryParams"
+              ref="queryFormRef"
+              layout="inline"
+          >
+              #foreach($column in $subColumns)
+                  #if ($column.listOperation)
+                      #set ($dictType = $column.dictType)
+                      #set ($javaField = $column.javaField)
+                      #set ($javaType = $column.javaType)
+                      #set ($comment = $column.columnComment)
+                      #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                          #set ($dictMethod = "number")
+                      #elseif ($javaType == "String")
+                          #set ($dictMethod = "string")
+                      #elseif ($javaType == "Boolean")
+                          #set ($dictMethod = "boolean")
+                      #end
+                      #if ($column.htmlType == "input")
+                        <Form.Item label="${comment}" name="${javaField}">
+                          <Input
+                              v-model:value="queryParams.${javaField}"
+                              placeholder="请输入${comment}"
+                              allowClear
+                              @pressEnter="handleQuery"
+                              class="w-full"
+                          />
+                        </Form.Item>
+                      #elseif ($column.htmlType == "select" || $column.htmlType == "radio" || $column.htmlType == "checkbox")
+                        <Form.Item label="${comment}" name="${javaField}">
+                          <Select
+                              v-model:value="queryParams.${javaField}"
+                              placeholder="请选择${comment}"
+                              allowClear
+                              class="w-full"
+                          >
+                              #if ("" != $dictType)## 设置了 dictType 数据字典的情况
+                                <SelectOption
+                                    v-for="dict in getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod')"
+                                    :key="dict.value"
+                                    :value="dict.value"
+                                >
+                                  {{ dict.label }}
+                                </SelectOption>
+                              #else## 未设置 dictType 数据字典的情况
+                                <SelectOption label="请选择字典生成" value="" />
+                              #end
+                          </Select>
+                        </Form.Item>
+                      #elseif($column.htmlType == "datetime")
+                          #if ($column.listOperationCondition != "BETWEEN")## 非范围
+                            <Form.Item label="${comment}" name="${javaField}">
+                              <DatePicker
+                                  v-model:value="queryParams.${javaField}"
+                                  valueFormat="YYYY-MM-DD"
+                                  placeholder="选择${comment}"
+                                  allowClear
+                                  class="w-full"
+                              />
+                            </Form.Item>
+                          #else## 范围
+                            <Form.Item label="${comment}" name="${javaField}">
+                              <RangePicker
+                                  v-model:value="queryParams.${javaField}"
+                                  v-bind="getRangePickerDefaultProps()"
+                                  class="w-full"
+                              />
+                            </Form.Item>
+                          #end
+                      #end
+                  #end
+              #end
+            <Form.Item>
+              <Button class="ml-2" @click="resetQuery"> 重置 </Button>
+              <Button class="ml-2" @click="handleQuery" type="primary">
+                搜索
+              </Button>
+            </Form.Item>
+          </Form>
+        </Card>
+
+        <!-- 列表 -->
+        <Card title="${table.classComment}">
+          <template #extra>
+            <VbenVxeTableToolbar
+                ref="tableToolbarRef"
+                v-model:hidden-search="hiddenSearchBar"
+            >
+              <Button
+                  class="ml-2"
+                  :icon="h(Plus)"
+                  type="primary"
+                  @click="handleCreate"
+                  v-access:code="['${permissionPrefix}:create']"
+              >
+                {{ $t('ui.actionTitle.create', ['${table.classComment}']) }}
+              </Button>
+                #if ($deleteBatchEnable)
+                  <Button
+                      :icon="h(Trash2)"
+                      type="primary"
+                      danger
+                      class="ml-2"
+                      :disabled="isEmpty(checkedIds)"
+                      @click="handleDeleteBatch"
+                      v-access:code="['${table.moduleName}:${simpleClassName_strikeCase}:delete']"
+                  >
+                    批量删除
+                  </Button>
+                #end
+            </VbenVxeTableToolbar>
+          </template>
+          <VxeTable
+              ref="tableRef"
+              :data="list"
+              show-overflow
+              :loading="loading"
+              #if ($deleteBatchEnable)
+              @checkboxAll="handleRowCheckboxChange"
+              @checkboxChange="handleRowCheckboxChange"
+              #end
+          >
+              #if ($deleteBatchEnable)
+                <VxeColumn type="checkbox" width="40" />
+              #end
+              #foreach($column in $subColumns)
+                  #if ($column.listOperationResult)
+                      #set ($dictType=$column.dictType)
+                      #set ($javaField = $column.javaField)
+                      #set ($comment=$column.columnComment)
+                      #if ($column.javaType == "LocalDateTime")## 时间类型
+                        <VxeColumn field="${javaField}" title="${comment}" align="center">
+                          <template #default="{row}">
+                            {{formatDateTime(row.${javaField})}}
+                          </template>
+                        </VxeColumn>
+                      #elseif($column.dictType && "" != $column.dictType)## 数据字典
+                        <VxeColumn field="${javaField}" title="${comment}" align="center">
+                          <template #default="{row}">
+                            <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="row.${javaField}" />
+                          </template>
+                        </VxeColumn>
+                      #elseif ($table.templateType == 2 && $javaField == $treeNameColumn.javaField)
+                        <VxeColumn field="${javaField}" title="${comment}" align="center"  tree-node/>
+                      #else
+                        <VxeColumn field="${javaField}" title="${comment}" align="center" />
+                      #end
+                  #end
+              #end
+            <VxeColumn field="operation" title="操作" align="center">
+              <template #default="{row}">
+                <Button
+                    size="small"
+                    type="link"
+                    @click="handleEdit(row)"
+                    v-access:code="['${permissionPrefix}:update']"
+                >
+                  {{ $t('ui.actionTitle.edit') }}
+                </Button>
+                <Button
+                    size="small"
+                    type="link"
+                    danger
+                    class="ml-2"
+                    @click="handleDelete(row)"
+                    v-access:code="['${permissionPrefix}:delete']"
+                >
+                  {{ $t('ui.actionTitle.delete') }}
+                </Button>
+              </template>
+            </VxeColumn>
+          </VxeTable>
+          <!-- 分页 -->
+          <div class="mt-2 flex justify-end">
+            <Pagination
+                :total="total"
+                v-model:current="queryParams.pageNo"
+                v-model:page-size="queryParams.pageSize"
+                show-size-changer
+                @change="getList"
+            />
+          </div>
+        </Card>
+      </div>
+    #else
+    <Card title="${subTable.classComment}列表">
+      <VxeTable
+          :data="list"
+          show-overflow
+          :loading="loading"
+      >
+          #foreach($column in $subColumns)
+              #if ($column.listOperationResult)
+                  #set ($dictType=$column.dictType)
+                  #set ($javaField = $column.javaField)
+                  #set ($comment=$column.columnComment)
+                  #if ($column.javaType == "LocalDateTime")## 时间类型
+                    <VxeColumn field="${javaField}" title="${comment}" align="center">
+                      <template #default="{row}">
+                        {{formatDateTime(row.${javaField})}}
+                      </template>
+                    </VxeColumn>
+                  #elseif($column.dictType && "" != $column.dictType)## 数据字典
+                    <VxeColumn field="${javaField}" title="${comment}" align="center">
+                      <template #default="{row}">
+                        <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="row.${javaField}" />
+                      </template>
+                    </VxeColumn>
+                  #else
+                    <VxeColumn field="${javaField}" title="${comment}" align="center" />
+                  #end
+              #end
+          #end
+      </VxeTable>
+    </Card>
+    #end
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_inner.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_inner.vue.vm
new file mode 100644
index 000000000..d46037b0a
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_inner.vue.vm
@@ -0,0 +1,4 @@
+## 子表的 erp 和 inner 使用相似的 list 列表，差异主要两点：
+## 1）inner 使用 list 不分页，erp 使用 page 分页
+## 2）erp 支持单个子表的新增、修改、删除，inner 不支持
+#parse("codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm")
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/data.ts.vm
new file mode 100644
index 000000000..34883d4b3
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/data.ts.vm
@@ -0,0 +1,616 @@
+#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api")
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ${apiName} } from '#/api/${table.moduleName}/${table.businessName}';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+#if(${table.templateType} == 2)## 树表需要导入这些
+import { get${simpleClassName}List } from '#/api/${table.moduleName}/${table.businessName}';
+import { handleTree } from '@vben/utils';
+#end
+
+import { getRangePickerDefaultProps } from '#/utils';
+
+/** 新增/修改的表单 */
+export function useFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+#if(${table.templateType} == 2)## 树表特有字段：上级
+    {
+      fieldName: '${treeParentColumn.javaField}',
+      label: '上级${table.classComment}',
+      component: 'ApiTreeSelect',
+      componentProps: {
+        allowClear: true,
+        api: async () => {
+          const data = await get${simpleClassName}List({});
+          data.unshift({
+            id: 0,
+            ${treeNameColumn.javaField}: '顶级${table.classComment}',
+          });
+          return handleTree(data);
+        },
+        labelField: '${treeNameColumn.javaField}',
+        valueField: 'id',
+        childrenField: 'children',
+        placeholder: '请选择上级${table.classComment}',
+        treeDefaultExpandAll: true,
+      },
+      rules: 'selectRequired',
+    },
+#end
+#foreach($column in $columns)
+#if ($column.createOperation || $column.updateOperation)
+#if (!$column.primaryKey && ($table.templateType != 2 || ($table.templateType == 2 && $column.id != $treeParentColumn.id)))## 树表中已经添加了父ID字段，这里排除
+  #set ($dictType = $column.dictType)
+  #set ($javaType = $column.javaType)
+  #set ($javaField = $column.javaField)
+  #set ($comment = $column.columnComment)
+  #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+    #set ($dictMethod = "number")
+  #elseif ($javaType == "String")
+    #set ($dictMethod = "string")
+  #elseif ($javaType == "Boolean")
+    #set ($dictMethod = "boolean")
+  #end
+    {
+      fieldName: '${javaField}',
+      label: '${comment}',
+  #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+      rules: 'required',
+  #end
+  #if ($column.htmlType == "input")
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入${comment}',
+      },
+  #elseif($column.htmlType == "imageUpload")## 图片上传
+      component: 'ImageUpload',
+  #elseif($column.htmlType == "fileUpload")## 文件上传
+      component: 'FileUpload',
+  #elseif($column.htmlType == "editor")## 文本编辑器
+      component: 'RichTextarea',
+  #elseif($column.htmlType == "select")## 下拉框
+      component: 'Select',
+      componentProps: {
+        #if ("" != $dictType)## 有数据字典
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+        #else##没数据字典
+        options: [],
+        #end
+        placeholder: '请选择${comment}',
+      },
+  #elseif($column.htmlType == "checkbox")## 多选框
+      component: 'Checkbox',
+      componentProps: {
+        #if ("" != $dictType)## 有数据字典
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+        #else##没数据字典
+        options: [],
+        #end
+      },
+  #elseif($column.htmlType == "radio")## 单选框
+      component: 'RadioGroup',
+      componentProps: {
+        #if ("" != $dictType)## 有数据字典
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+        #else##没数据字典
+        options: [],
+        #end
+        buttonStyle: 'solid',
+        optionType: 'button',
+      },
+  #elseif($column.htmlType == "datetime")## 时间框
+      component: 'DatePicker',
+      componentProps: {
+        showTime: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      },
+  #elseif($column.htmlType == "textarea")## 文本域
+      component: 'TextArea',
+      componentProps: {
+        placeholder: '请输入${comment}',
+      },
+  #elseif($column.htmlType == "inputNumber")## 数字输入框
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        placeholder: '请输入${comment}',
+      },
+  #end
+    },
+#end
+#end
+#end
+  ];
+}
+
+#if ($importEnable)
+/** 导入的表单 */
+export function useImportFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'file',
+      label: '${table.classComment}数据',
+      component: 'Upload',
+      rules: 'required',
+      help: '仅允许导入 xls、xlsx 格式文件',
+    },
+  ];
+}
+
+#end
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+#foreach($column in $columns)
+#if ($column.listOperation)
+  #set ($dictType = $column.dictType)
+  #set ($javaType = $column.javaType)
+  #set ($javaField = $column.javaField)
+  #set ($comment = $column.columnComment)
+  #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+    #set ($dictMethod = "number")
+  #elseif ($javaType == "String")
+    #set ($dictMethod = "string")
+  #elseif ($javaType == "Boolean")
+    #set ($dictMethod = "boolean")
+  #end
+    {
+      fieldName: '${javaField}',
+      label: '${comment}',
+  #if ($column.htmlType == "input" || $column.htmlType == "textarea" || $column.htmlType == "editor")
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入${comment}',
+      },
+  #elseif ($column.htmlType == "select" || $column.htmlType == "radio")
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        #if ("" != $dictType)## 设置了 dictType 数据字典的情况
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+        #else## 未设置 dictType 数据字典的情况
+        options: [],
+        #end
+        placeholder: '请选择${comment}',
+      },
+  #elseif($column.htmlType == "datetime")
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+  #end
+    },
+#end
+#end
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<${apiName}.${simpleClassName}>['columns'] {
+  return [
+#if ($table.templateType != 2 && $deleteBatchEnable)
+  { type: 'checkbox', width: 40 },
+#end
+#if ($table.templateType == 12) ## 内嵌情况
+      { type: 'expand', width: 80, slots: { content: 'expand_content' } },
+#end
+#foreach($column in $columns)
+#if ($column.listOperationResult)
+  #set ($dictType = $column.dictType)
+  #set ($javaField = $column.javaField)
+  #set ($comment = $column.columnComment)
+    {
+      field: '${javaField}',
+      title: '${comment}',
+      minWidth: 120,
+  #if ($column.javaType == "LocalDateTime")## 时间类型
+      formatter: 'formatDateTime',
+  #elseif("" != $dictType)## 数据字典
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.$dictType.toUpperCase() },
+      },
+  #end
+  #if (${table.templateType} == 2 && $column.id == $treeNameColumn.id)## 树表特有:标记树节点列
+      treeNode: true,
+  #end
+    },
+#end
+#end
+    {
+      title: '操作',
+      width: 200,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+## 标准模式和内嵌模式时，主子关系一对一则生成表单schema,一对多则生成列表schema（内嵌模式时表单schema也要生成）。erp 模式时都生成
+## 特殊：主子表专属逻辑
+#foreach ($subTable in $subTables)
+    #set ($index = $foreach.count - 1)
+    #set ($subColumns = $subColumnsList.get($index))##当前字段数组
+    #set ($subSimpleClassName = $subSimpleClassNames.get($index))
+    #set ($subJoinColumn = $subJoinColumns.get($index))##当前 join 字段
+    #set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($index))
+// ==================== 子表（$subTable.classComment） ====================
+
+#if ($table.templateType == 11) ## erp 情况
+/** 新增/修改的表单 */
+export function use${subSimpleClassName}FormSchema(): VbenFormSchema[] {
+    return [
+        {
+            fieldName: 'id',
+            component: 'Input',
+            dependencies: {
+                triggerFields: [''],
+                show: () => false,
+            },
+        },
+        #foreach($column in $subColumns)
+            #if ($column.createOperation || $column.updateOperation)
+                #if (!$column.primaryKey && ($table.templateType != 2 || ($table.templateType == 2 && $column.id != $treeParentColumn.id)))## 树表中已经添加了父ID字段，这里排除
+                    #set ($dictType = $column.dictType)
+                    #set ($javaType = $column.javaType)
+                    #set ($javaField = $column.javaField)
+                    #set ($comment = $column.columnComment)
+                    #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                        #set ($dictMethod = "number")
+                    #elseif ($javaType == "String")
+                        #set ($dictMethod = "string")
+                    #elseif ($javaType == "Boolean")
+                        #set ($dictMethod = "boolean")
+                    #end
+                    #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+                    #else
+                        {
+                            fieldName: '${javaField}',
+                            label: '${comment}',
+                            #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+                                rules: 'required',
+                            #end
+                            #if ($column.htmlType == "input")
+                                component: 'Input',
+                                componentProps: {
+                                    placeholder: '请输入${comment}',
+                                },
+                            #elseif($column.htmlType == "imageUpload")## 图片上传
+                                component: 'ImageUpload',
+                            #elseif($column.htmlType == "fileUpload")## 文件上传
+                                component: 'FileUpload',
+                            #elseif($column.htmlType == "editor")## 文本编辑器
+                                component: 'RichTextarea',
+                            #elseif($column.htmlType == "select")## 下拉框
+                                component: 'Select',
+                                componentProps: {
+                                    #if ("" != $dictType)## 有数据字典
+                                        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+                                    #else##没数据字典
+                                        options: [],
+                                    #end
+                                    placeholder: '请选择${comment}',
+                                },
+                            #elseif($column.htmlType == "checkbox")## 多选框
+                                component: 'Checkbox',
+                                componentProps: {
+                                    #if ("" != $dictType)## 有数据字典
+                                        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+                                    #else##没数据字典
+                                        options: [],
+                                    #end
+                                },
+                            #elseif($column.htmlType == "radio")## 单选框
+                                component: 'RadioGroup',
+                                componentProps: {
+                                    #if ("" != $dictType)## 有数据字典
+                                        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+                                    #else##没数据字典
+                                        options: [],
+                                    #end
+                                    buttonStyle: 'solid',
+                                    optionType: 'button',
+                                },
+                            #elseif($column.htmlType == "datetime")## 时间框
+                                component: 'DatePicker',
+                                componentProps: {
+                                    showTime: true,
+                                    format: 'YYYY-MM-DD HH:mm:ss',
+                                    valueFormat: 'x',
+                                },
+                            #elseif($column.htmlType == "textarea")## 文本域
+                                component: 'TextArea',
+                                componentProps: {
+                                    placeholder: '请输入${comment}',
+                                },
+                            #elseif($column.htmlType == "inputNumber")## 数字输入框
+                                component: 'InputNumber',
+                                componentProps: {
+                                    min: 0,
+                                    placeholder: '请输入${comment}',
+                                },
+                            #end
+                        },
+                    #end
+                #end
+            #end
+        #end
+    ];
+}
+
+/** 列表的搜索表单 */
+export function use${subSimpleClassName}GridFormSchema(): VbenFormSchema[] {
+    return [
+        #foreach($column in $subColumns)
+            #if ($column.listOperation)
+                #set ($dictType = $column.dictType)
+                #set ($javaType = $column.javaType)
+                #set ($javaField = $column.javaField)
+                #set ($comment = $column.columnComment)
+                #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                    #set ($dictMethod = "number")
+                #elseif ($javaType == "String")
+                    #set ($dictMethod = "string")
+                #elseif ($javaType == "Boolean")
+                    #set ($dictMethod = "boolean")
+                #end
+                {
+                    fieldName: '${javaField}',
+                    label: '${comment}',
+                    #if ($column.htmlType == "input" || $column.htmlType == "textarea" || $column.htmlType == "editor")
+                        component: 'Input',
+                        componentProps: {
+                            allowClear: true,
+                            placeholder: '请输入${comment}',
+                        },
+                    #elseif ($column.htmlType == "select" || $column.htmlType == "radio")
+                        component: 'Select',
+                        componentProps: {
+                            allowClear: true,
+                            #if ("" != $dictType)## 设置了 dictType 数据字典的情况
+                                options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+                            #else## 未设置 dictType 数据字典的情况
+                                options: [],
+                            #end
+                            placeholder: '请选择${comment}',
+                        },
+                    #elseif($column.htmlType == "datetime")
+                        component: 'RangePicker',
+                        componentProps: {
+                            ...getRangePickerDefaultProps(),
+                            allowClear: true,
+                        },
+                    #end
+                },
+            #end
+        #end
+    ];
+}
+
+/** 列表的字段 */
+export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${apiName}.${subSimpleClassName}>['columns'] {
+    return [
+        #if ($table.templateType != 2 && $deleteBatchEnable)
+            { type: 'checkbox', width: 40 },
+        #end
+        #foreach($column in $subColumns)
+            #if ($column.listOperationResult)
+                #set ($dictType = $column.dictType)
+                #set ($javaField = $column.javaField)
+                #set ($comment = $column.columnComment)
+                {
+                    field: '${javaField}',
+                    title: '${comment}',
+                    minWidth: 120,
+                    #if ($column.javaType == "LocalDateTime")## 时间类型
+                        formatter: 'formatDateTime',
+                    #elseif("" != $dictType)## 数据字典
+                        cellRender: {
+                            name: 'CellDict',
+                            props: { type: DICT_TYPE.$dictType.toUpperCase() },
+                        },
+                    #end
+                },
+            #end
+        #end
+        {
+            title: '操作',
+            width: 200,
+            fixed: 'right',
+            slots: { default: 'actions' },
+        },
+    ];
+}
+
+#else
+    #if ($subTable.subJoinMany) ## 一对多
+    /** 新增/修改列表的字段 */
+    export function use${subSimpleClassName}GridEditColumns(): VxeTableGridOptions<${apiName}.${subSimpleClassName}>['columns'] {
+        return [
+            #foreach($column in $subColumns)
+                #if ($column.createOperation || $column.updateOperation)
+                    #if (!$column.primaryKey && $column.listOperationResult && $column.id != $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+                        #set ($dictType = $column.dictType)
+                        #set ($javaField = $column.javaField)
+                        #set ($comment = $column.columnComment)
+                        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                            #set ($dictMethod = "number")
+                        #elseif ($javaType == "String")
+                            #set ($dictMethod = "string")
+                        #elseif ($javaType == "Boolean")
+                            #set ($dictMethod = "boolean")
+                        #end
+                        {
+                            field: '${javaField}',
+                            title: '${comment}',
+                            minWidth: 120,
+                            slots: { default: '${javaField}' },
+                            #if ($column.htmlType == "select" || $column.htmlType == "checkbox" || $column.htmlType == "radio")
+                                #if ("" != $dictType)## 有数据字典
+                                    params: {
+                                        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+                                    },
+                                #else
+                                    params: {
+                                        options: [],
+                                    },
+                                #end
+                            #end
+                        },
+                    #end
+                #end
+            #end
+            {
+                title: '操作',
+                width: 200,
+                fixed: 'right',
+                slots: { default: 'actions' },
+            },
+        ];
+    }
+
+    #else
+    /** 新增/修改的表单 */
+    export function use${subSimpleClassName}FormSchema(): VbenFormSchema[] {
+        return [
+            {
+                fieldName: 'id',
+                component: 'Input',
+                dependencies: {
+                    triggerFields: [''],
+                    show: () => false,
+                },
+            },
+            #foreach($column in $subColumns)
+                #if ($column.createOperation || $column.updateOperation)
+                    #if (!$column.primaryKey && ($table.templateType != 2 || ($table.templateType == 2 && $column.id != $treeParentColumn.id)))## 树表中已经添加了父ID字段，这里排除
+                        #set ($dictType = $column.dictType)
+                        #set ($javaType = $column.javaType)
+                        #set ($javaField = $column.javaField)
+                        #set ($comment = $column.columnComment)
+                        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                            #set ($dictMethod = "number")
+                        #elseif ($javaType == "String")
+                            #set ($dictMethod = "string")
+                        #elseif ($javaType == "Boolean")
+                            #set ($dictMethod = "boolean")
+                        #end
+                        #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+                        #else
+                            {
+                                fieldName: '${javaField}',
+                                label: '${comment}',
+                                #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+                                    rules: 'required',
+                                #end
+                                #if ($column.htmlType == "input")
+                                    component: 'Input',
+                                    componentProps: {
+                                        placeholder: '请输入${comment}',
+                                    },
+                                #elseif($column.htmlType == "imageUpload")## 图片上传
+                                    component: 'ImageUpload',
+                                #elseif($column.htmlType == "fileUpload")## 文件上传
+                                    component: 'FileUpload',
+                                #elseif($column.htmlType == "editor")## 文本编辑器
+                                    component: 'RichTextarea',
+                                #elseif($column.htmlType == "select")## 下拉框
+                                    component: 'Select',
+                                    componentProps: {
+                                        #if ("" != $dictType)## 有数据字典
+                                            options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+                                        #else##没数据字典
+                                            options: [],
+                                        #end
+                                        placeholder: '请选择${comment}',
+                                    },
+                                #elseif($column.htmlType == "checkbox")## 多选框
+                                    component: 'Checkbox',
+                                    componentProps: {
+                                        #if ("" != $dictType)## 有数据字典
+                                            options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+                                        #else##没数据字典
+                                            options: [],
+                                        #end
+                                    },
+                                #elseif($column.htmlType == "radio")## 单选框
+                                    component: 'RadioGroup',
+                                    componentProps: {
+                                        #if ("" != $dictType)## 有数据字典
+                                            options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+                                        #else##没数据字典
+                                            options: [],
+                                        #end
+                                        buttonStyle: 'solid',
+                                        optionType: 'button',
+                                    },
+                                #elseif($column.htmlType == "datetime")## 时间框
+                                    component: 'DatePicker',
+                                    componentProps: {
+                                        showTime: true,
+                                        format: 'YYYY-MM-DD HH:mm:ss',
+                                        valueFormat: 'x',
+                                    },
+                                #elseif($column.htmlType == "textarea")## 文本域
+                                    component: 'TextArea',
+                                    componentProps: {
+                                        placeholder: '请输入${comment}',
+                                    },
+                                #elseif($column.htmlType == "inputNumber")## 数字输入框
+                                    component: 'InputNumber',
+                                    componentProps: {
+                                        min: 0,
+                                        placeholder: '请输入${comment}',
+                                    },
+                                #end
+                            },
+                        #end
+                    #end
+                #end
+            #end
+        ];
+    }
+
+    #end
+    #if ($table.templateType == 12) ## 内嵌情况
+    /** 列表的字段 */
+    export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${simpleClassName}Api.${subSimpleClassName}>['columns'] {
+        return [
+            #foreach($column in $subColumns)
+                #if ($column.listOperationResult)
+                    #set ($dictType = $column.dictType)
+                    #set ($javaField = $column.javaField)
+                    #set ($comment = $column.columnComment)
+                    {
+                        field: '${javaField}',
+                        title: '${comment}',
+                        minWidth: 120,
+                        #if ($column.javaType == "LocalDateTime")## 时间类型
+                            formatter: 'formatDateTime',
+                        #elseif("" != $dictType)## 数据字典
+                            cellRender: {
+                                name: 'CellDict',
+                                props: { type: DICT_TYPE.$dictType.toUpperCase() },
+                            },
+                        #end
+                    },
+                #end
+            #end
+        ];
+    }
+    #end
+#end
+#end
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/form.vue.vm
new file mode 100644
index 000000000..d140f2372
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/form.vue.vm
@@ -0,0 +1,157 @@
+#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api")
+<script lang="ts" setup>
+import type { ${apiName} } from '#/api/${table.moduleName}/${table.businessName}';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message#if ($table.templateType == 11), Tabs#end } from 'antdv-next';
+
+import { useVbenForm } from '#/adapter/form';
+import { create${simpleClassName}, get${simpleClassName}, update${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
+import { $t } from '#/locales';
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 10 || $table.templateType == 12 )
+  #foreach ($subSimpleClassName in $subSimpleClassNames)
+  #set ($index = $foreach.count - 1)
+  #set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($index))
+  import ${subSimpleClassName}Form from './${subSimpleClassName_strikeCase}-form.vue'
+  #end
+#end
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<${apiName}.${simpleClassName}>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['${table.classComment}'])
+    : $t('ui.actionTitle.create', ['${table.classComment}']);
+});
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 10 || $table.templateType == 12 )
+  #if ( $subTables && $subTables.size() > 0 )
+
+  /** 子表的表单 */
+  const subTabsName = ref('$subClassNameVars.get(0)')
+    #foreach ($subClassNameVar in $subClassNameVars)
+      #set ($index = $foreach.count - 1)
+      #set ($subSimpleClassName = $subSimpleClassNames.get($index))
+      const ${subClassNameVar}FormRef = ref<InstanceType<typeof ${subSimpleClassName}Form>>()
+    #end
+  #end
+#end
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 80,
+  },
+  layout: 'horizontal',
+  schema: useFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 10 || $table.templateType == 12 )
+      #if ( $subTables && $subTables.size() > 0 )
+        // 校验子表单
+        #foreach ($subTable in $subTables)
+          #set ($index = $foreach.count - 1)
+          #set ($subClassNameVar = $subClassNameVars.get($index))
+          #if ($subTable.subJoinMany) ## 一对多
+            ## TODO 列表值校验？
+          #else
+            const ${subClassNameVar}Valid = await ${subClassNameVar}FormRef.value?.validate();
+            if (!${subClassNameVar}Valid) {
+              subTabsName.value = '${subClassNameVar}';
+              return;
+            }
+          #end
+        #end
+      #end
+#end
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as ${apiName}.${simpleClassName};
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 10 || $table.templateType == 12 )
+      #if ( $subTables && $subTables.size() > 0 )
+        // 拼接子表的数据
+        #foreach ($subTable in $subTables)
+          #set ($index = $foreach.count - 1)
+          #set ($subClassNameVar = $subClassNameVars.get($index))
+          #if ($subTable.subJoinMany)
+            data.${subClassNameVar}s = ${subClassNameVar}FormRef.value?.getData();
+          #else
+            data.${subClassNameVar} = await ${subClassNameVar}FormRef.value?.getValues();
+          #end
+        #end
+      #end
+#end
+    try {
+      await (formData.value?.id ? update${simpleClassName}(data) : create${simpleClassName}(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<${apiName}.${simpleClassName}>();
+    if (!data || !data.id) {
+#if (${table.templateType} == 2)## 树表特有
+      // 设置上级
+      await formApi.setValues(data);
+#end
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await get${simpleClassName}(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle">
+    <Form class="mx-4" />
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 10 || $table.templateType == 12 )
+      <!-- 子表的表单 -->
+      <Tabs v-model:active-key="subTabsName">
+        #foreach ($subTable in $subTables)
+          #set ($index = $foreach.count - 1)
+          #set ($subClassNameVar = $subClassNameVars.get($index))
+          #set ($subSimpleClassName = $subSimpleClassNames.get($index))
+          #set ($subJoinColumn_strikeCase = $subJoinColumn_strikeCases.get($index))
+          <TabPane key="$subClassNameVar" tab="${subTable.classComment}" force-render>
+            <${subSimpleClassName}Form ref="${subClassNameVar}FormRef" :${subJoinColumn_strikeCase}="formData?.id" />
+          </TabPane>
+        #end
+      </Tabs>
+#end
+  </Modal>
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/import.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/import.vue.vm
new file mode 100644
index 000000000..e8f90fddc
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/import.vue.vm
@@ -0,0 +1,82 @@
+<script lang="ts" setup>
+import type { FileType } from 'antdv-next/es/upload/interface';
+
+import { useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message, Upload } from 'antdv-next';
+
+import { useVbenForm } from '#/adapter/form';
+import { import${simpleClassName}, import${simpleClassName}Template } from '#/api/${table.moduleName}/${table.businessName}';
+import { $t } from '#/locales';
+
+import { useImportFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useImportFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = await formApi.getValues();
+    try {
+      await import${simpleClassName}(data.file);
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+
+/** 上传前 */
+function beforeUpload(file: FileType) {
+  formApi.setFieldValue('file', file);
+  return false;
+}
+
+/** 下载模板 */
+async function handleDownload() {
+  const data = await import${simpleClassName}Template();
+  downloadFileFromBlobPart({ fileName: '${table.classComment}导入模板.xls', source: data });
+}
+</script>
+
+<template>
+  <Modal title="导入${table.classComment}" class="w-1/3">
+    <Form class="mx-4">
+      <template #file>
+        <div class="w-full">
+          <Upload
+            :max-count="1"
+            accept=".xls,.xlsx"
+            :before-upload="beforeUpload"
+          >
+            <Button type="primary"> 选择 Excel 文件 </Button>
+          </Upload>
+        </div>
+      </template>
+    </Form>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center">
+        <Button @click="handleDownload"> 下载导入模板 </Button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/index.vue.vm
new file mode 100644
index 000000000..071ecd175
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/index.vue.vm
@@ -0,0 +1,347 @@
+#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api")
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ${apiName} } from '#/api/${table.moduleName}/${table.businessName}';
+
+import { ref } from 'vue';
+
+import {#if ($table.templateType != 2 && $deleteBatchEnable) confirm,#end Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart#if ($table.templateType != 2 && $deleteBatchEnable), isEmpty#end } from '@vben/utils';
+
+import { message#if ($table.templateType == 11), Tabs#end } from 'antdv-next';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+#if (${table.templateType} == 2)## 树表接口
+import {
+  delete${simpleClassName},
+  export${simpleClassName},
+  get${simpleClassName}List,
+} from '#/api/${table.moduleName}/${table.businessName}';
+#else## 标准表接口
+import {
+  delete${simpleClassName},#if ($deleteBatchEnable)
+
+  delete${simpleClassName}List,#end
+  export${simpleClassName},
+  get${simpleClassName}Page,
+} from '#/api/${table.moduleName}/${table.businessName}';
+#end
+#if ($importEnable)
+import ${simpleClassName}Import from './modules/import-form.vue';
+#end
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 11 || $table.templateType == 12 )
+    #foreach ($subSimpleClassName in $subSimpleClassNames)
+    #set ($index = $foreach.count - 1)
+    #set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($index))
+import ${subSimpleClassName}List from './modules/${subSimpleClassName_strikeCase}-list.vue';
+    #end
+#end
+
+#if ($table.templateType == 12 || $table.templateType == 11) ## 内嵌和erp情况
+/** 子表的列表 */
+const subTabsName = ref('$subClassNameVars.get(0)')
+#if ($table.templateType == 11)
+const select${simpleClassName} = ref<${apiName}.${simpleClassName}>();
+#end
+#end
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+#if ($importEnable)
+const [ImportFormModal, importFormModalApi] = useVbenModal({
+  connectedComponent: ${simpleClassName}Import,
+  destroyOnClose: true,
+});
+
+/** 导入${table.classComment} */
+function handleImport() {
+  importFormModalApi.open();
+}
+#end
+#if (${table.templateType} == 2)## 树表特有：控制表格展开收缩
+
+/** 切换树形展开/收缩状态 */
+const isExpanded = ref(true);
+function handleExpand() {
+  isExpanded.value = !isExpanded.value;
+  gridApi.grid.setAllTreeExpand(isExpanded.value);
+}
+#end
+
+/** 刷新表格 */
+function handleRefresh() {
+#if ($table.templateType == 12) ## 内嵌情况
+  gridApi.reload();
+#else
+  gridApi.query();
+#end
+}
+
+/** 创建${table.classComment} */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+#if (${table.templateType} == 2)## 树表特有：新增下级
+
+/** 添加下级${table.classComment} */
+function handleAppend(row: ${apiName}.${simpleClassName}) {
+  formModalApi.setData({ ${treeParentColumn.javaField}: row.id }).open();
+}
+#end
+
+/** 编辑${table.classComment} */
+function handleEdit(row: ${apiName}.${simpleClassName}) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除${table.classComment} */
+async function handleDelete(row: ${apiName}.${simpleClassName}) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.id]),
+    duration: 0,
+  });
+  try {
+    await delete${simpleClassName}(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+#if ($table.templateType != 2 && $deleteBatchEnable)
+/** 批量删除${table.classComment} */
+async function handleDeleteBatch() {
+  await confirm($t('ui.actionMessage.deleteBatchConfirm'));
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deletingBatch'),
+    duration: 0,
+  });
+  try {
+    await delete${simpleClassName}List(checkedIds.value);
+    checkedIds.value = [];
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const checkedIds = ref<number[]>([]);
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ${apiName}.${simpleClassName}[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+#end
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await export${simpleClassName}(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '${table.classComment}.xls', source: data });
+}
+
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+#if (${table.templateType} == 11)
+    height: '600px',
+#else
+    height: 'auto',
+#end
+#if (${table.templateType} == 2)## 树表设置
+    pagerConfig: {
+      enabled: false,
+    },
+#else## 标准表设置
+    keepSource: true,
+#end
+    proxyConfig: {
+      ajax: {
+#if (${table.templateType} == 2)## 树表数据加载
+        query: async (_, formValues) => {
+          return await get${simpleClassName}List(formValues);
+        },
+#else## 标准表数据加载
+        query: async ({ page }, formValues) => {
+          return await get${simpleClassName}Page({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+#end
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+#if (${table.templateType} == 11)
+      isCurrent: true,
+#end
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+#if (${table.templateType} == 2)## 树表设置
+    treeConfig: {
+      parentField: '${treeParentColumn.javaField}',
+      rowField: 'id',
+      transform: true,
+      expandAll: true,
+      reserve: true,
+    },
+#end
+  } as VxeTableGridOptions<${apiName}.${simpleClassName}>,
+#if (${table.templateType} == 11 || (${table.templateType} != 2 && $deleteBatchEnable))
+  gridEvents: {
+  #if(${table.templateType} == 11)
+    cellClick: ({ row }: { row: ${apiName}.${simpleClassName}}) => {
+      select${simpleClassName}.value = row;
+    },
+  #end
+  #if (${table.templateType} != 2 && $deleteBatchEnable)
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  #end
+  },
+#end
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <FormModal @success="handleRefresh" />
+#if ($importEnable)
+    <ImportFormModal @success="handleRefresh" />
+#end
+#if ($table.templateType == 11) ## erp情况
+  <div>
+#end
+    <Grid table-title="${table.classComment}列表">
+        #if ($table.templateType == 12) ## 内嵌情况
+          <template #expand_content="{ row }">
+            <!-- 子表的表单 -->
+            <Tabs v-model:active-key="subTabsName" class="mx-8">
+                #foreach ($subTable in $subTables)
+                    #set ($index = $foreach.count - 1)
+                    #set ($subClassNameVar = $subClassNameVars.get($index))
+                    #set ($subSimpleClassName = $subSimpleClassNames.get($index))
+                    #set ($subJoinColumn_strikeCase = $subJoinColumn_strikeCases.get($index))
+                  <TabPane key="$subClassNameVar" tab="${subTable.classComment}" force-render>
+                    <${subSimpleClassName}List :${subJoinColumn_strikeCase}="row?.id" />
+                  </TabPane>
+                #end
+            </Tabs>
+          </template>
+        #end
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['${table.classComment}']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['${table.moduleName}:${simpleClassName_strikeCase}:create'],
+              onClick: handleCreate,
+            },
+            #if (${table.templateType} == 2)## 树表特有：展开/收缩按钮
+            {
+              label: isExpanded ? '收缩' : '展开',
+              type: 'primary',
+              onClick: handleExpand,
+            },
+            #end
+#if ($importEnable)
+            {
+              label: '导入',
+              type: 'primary',
+              auth: ['${table.moduleName}:${simpleClassName_strikeCase}:import'],
+              onClick: handleImport,
+            },
+#end
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['${table.moduleName}:${simpleClassName_strikeCase}:export'],
+              onClick: handleExport,
+            },
+            #if ($table.templateType != 2 && $deleteBatchEnable)
+            {
+              label: $t('ui.actionTitle.deleteBatch'),
+              type: 'primary',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['${table.moduleName}:${simpleClassName_strikeCase}:delete'],
+              disabled: isEmpty(checkedIds),
+              onClick: handleDeleteBatch,
+            },
+            #end
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            #if (${table.templateType} == 2)## 树表特有：新增下级
+            {
+              label: '新增下级',
+              type: 'link',
+              icon: ACTION_ICON.ADD,
+              auth: ['${table.moduleName}:${simpleClassName_strikeCase}:create'],
+              onClick: handleAppend.bind(null, row),
+            },
+            #end
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['${table.moduleName}:${simpleClassName_strikeCase}:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['${table.moduleName}:${simpleClassName_strikeCase}:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.id]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+#if ($table.templateType == 11) ## erp情况
+    <!-- 子表的表单 -->
+    <Tabs v-model:active-key="subTabsName" class="mt-2">
+        #foreach ($subTable in $subTables)
+            #set ($index = $foreach.count - 1)
+            #set ($subClassNameVar = $subClassNameVars.get($index))
+            #set ($subSimpleClassName = $subSimpleClassNames.get($index))
+            #set ($subJoinColumn_strikeCase = $subJoinColumn_strikeCases.get($index))
+          <TabPane key="$subClassNameVar" tab="${subTable.classComment}" force-render>
+            <${subSimpleClassName}List :${subJoinColumn_strikeCase}="select${simpleClassName}?.id" />
+          </TabPane>
+        #end
+    </Tabs>
+    </div>
+#end
+  </Page>
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_erp.vue.vm
new file mode 100644
index 000000000..fefa96529
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_erp.vue.vm
@@ -0,0 +1,89 @@
+#set ($subTable = $subTables.get($subIndex))##当前表
+#set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组
+#set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
+#set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
+#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api")
+<script lang="ts" setup>
+  import type { ${apiName} } from '#/api/${table.moduleName}/${table.businessName}';
+
+  import { useVbenModal } from '@vben/common-ui';
+  import { message } from 'antdv-next';
+
+  import { computed, ref } from 'vue';
+  import { $t } from '#/locales';
+  import { useVbenForm } from '#/adapter/form';
+  import { get${subSimpleClassName}, create${subSimpleClassName}, update${subSimpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
+
+  import { use${subSimpleClassName}FormSchema } from '../data';
+
+  const emit = defineEmits(['success']);
+  const formData = ref<${apiName}.${subSimpleClassName}>();
+  const getTitle = computed(() => {
+    return formData.value?.id
+        ? $t('ui.actionTitle.edit', ['${subTable.classComment}'])
+        : $t('ui.actionTitle.create', ['${subTable.classComment}']);
+  });
+
+  const [Form, formApi] = useVbenForm({
+    commonConfig: {
+      componentProps: {
+        class: 'w-full',
+      },
+      formItemClass: 'col-span-2',
+      labelWidth: 80,
+    },
+    layout: 'horizontal',
+    schema: use${subSimpleClassName}FormSchema(),
+    showDefaultActions: false
+  });
+
+  const [Modal, modalApi] = useVbenModal({
+    async onConfirm() {
+      const { valid } = await formApi.validate();
+      if (!valid) {
+        return;
+      }
+      modalApi.lock();
+      // 提交表单
+      const data = (await formApi.getValues()) as ${apiName}.${subSimpleClassName};
+      data.${subJoinColumn.javaField} = formData.value?.${subJoinColumn.javaField};
+      try {
+        await (formData.value?.id ? update${subSimpleClassName}(data) : create${subSimpleClassName}(data));
+        // 关闭并提示
+        await modalApi.close();
+        emit('success');
+        message.success( $t('ui.actionMessage.operationSuccess') );
+      } finally {
+        modalApi.unlock();
+      }
+    },
+    async onOpenChange(isOpen: boolean) {
+      if (!isOpen) {
+        formData.value = undefined;
+        return;
+      }
+      // 加载数据
+      let data = modalApi.getData<${apiName}.${subSimpleClassName}>();
+      if (!data) {
+        return;
+      }
+      if (data.id) {
+        modalApi.lock();
+        try {
+          data = await get${subSimpleClassName}(data.id);
+        } finally {
+          modalApi.unlock();
+        }
+      }
+      // 设置到 values
+      formData.value = data;
+      await formApi.setValues(formData.value);
+    },
+  });
+</script>
+
+<template>
+  <Modal :title="getTitle">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_inner.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_inner.vue.vm
new file mode 100644
index 000000000..2c596951c
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_inner.vue.vm
@@ -0,0 +1,2 @@
+## 主表的 normal 和 inner 使用相同的 form 表单
+#parse("codegen/vue3_vben5_antd/schema/views/modules/form_sub_normal.vue.vm")
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_normal.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_normal.vue.vm
new file mode 100644
index 000000000..f74b03cc1
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_normal.vue.vm
@@ -0,0 +1,195 @@
+#set ($subTable = $subTables.get($subIndex))##当前表
+#set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组
+#set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
+#set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
+#set ($subClassNameVar = $subClassNameVars.get($subIndex))
+#set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api")
+<script lang="ts" setup>
+  import type { ${apiName} } from '#/api/${table.moduleName}/${table.businessName}';
+
+  import { computed, ref, h, onMounted, watch, nextTick } from 'vue';
+
+  import { $t } from '#/locales';
+
+#if ($subTable.subJoinMany) ## 一对多
+import { Plus } from "@vben/icons";
+import { Button, Tabs, Checkbox, Input, TextArea, Select,RadioGroup,CheckboxGroup, DatePicker } from 'antdv-next';
+import { ImageUpload, FileUpload } from "#/components/upload";
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { use${subSimpleClassName}GridEditColumns } from '../data';
+import { get${subSimpleClassName}ListBy${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
+#else
+import { useVbenForm } from '#/adapter/form';
+import { use${subSimpleClassName}FormSchema } from '../data';
+import { get${subSimpleClassName}By${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
+#end
+
+const props = defineProps<{
+   ${subJoinColumn.javaField}?: number // ${subJoinColumn.columnComment}（主表的关联字段）
+}>()
+
+#if ($subTable.subJoinMany) ## 一对多
+const [Grid, gridApi] = useVbenVxeGrid({
+gridOptions: {
+  columns: use${subSimpleClassName}GridEditColumns(),
+  border: true,
+  showOverflow: true,
+  autoResize: true,
+  keepSource: true,
+  rowConfig: {
+    keyField: 'id',
+  },
+  pagerConfig: {
+    enabled: false,
+  },
+  toolbarConfig: {
+    enabled: false,
+  },
+},
+});
+
+/** 添加${subTable.classComment} */
+const handleAdd = async () => {
+  await gridApi.grid.insertAt({} as ${apiName}.${subSimpleClassName}, -1);
+}
+
+/** 删除${subTable.classComment} */
+const handleDelete =  async (row: ${apiName}.${subSimpleClassName}) => {
+  await gridApi.grid.remove(row);
+}
+
+/** 提供获取表格数据的方法供父组件调用 */
+defineExpose({
+  getData: (): ${apiName}.${subSimpleClassName}[] => {
+    const data = gridApi.grid.getData() as ${apiName}.${subSimpleClassName}[];
+    const removeRecords = gridApi.grid.getRemoveRecords() as ${apiName}.${subSimpleClassName}[];
+    const insertRecords = gridApi.grid.getInsertRecords() as ${apiName}.${subSimpleClassName}[];
+    return data
+        .filter((row) => !removeRecords.some((removed) => removed.id === row.id))
+        .concat(insertRecords.map((row: any) => ({ ...row, id: undefined })));
+  },
+});
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+    () => props.${subJoinColumn.javaField},
+    async (val) => {
+      if (!val) {
+        return;
+      }
+      await nextTick();
+      await gridApi.grid.loadData(await get${subSimpleClassName}ListBy${SubJoinColumnName}(props.${subJoinColumn.javaField}!));
+    },
+    { immediate: true },
+);
+#else
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 80,
+  },
+  layout: 'horizontal',
+  schema: use${subSimpleClassName}FormSchema(),
+  showDefaultActions: false
+});
+
+/** 暴露出表单校验方法和表单值获取方法 */
+defineExpose({
+  validate: async () => {
+    const { valid } = await formApi.validate();
+    return valid;
+  },
+  getValues: formApi.getValues,
+});
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+    () => props.${subJoinColumn.javaField},
+    async (val) => {
+      if (!val) {
+        return;
+      }
+      await nextTick();
+      await formApi.setValues(await get${subSimpleClassName}By${SubJoinColumnName}(props.${subJoinColumn.javaField}!));
+    },
+    { immediate: true },
+);
+#end
+</script>
+
+<template>
+#if ($subTable.subJoinMany) ## 一对多
+  <Grid class="mx-4">
+      #foreach($column in $subColumns)
+          #if ($column.createOperation || $column.updateOperation)
+              #set ($javaField = $column.javaField)
+              #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+              #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+                <template #${javaField}="{ row }">
+                  <Input v-model:value="row.${javaField}" />
+                </template>
+              #elseif($column.htmlType == "imageUpload")## 图片上传
+                <template #${javaField}="{ row }">
+                  <ImageUpload v-model:value="row.${javaField}" />
+                </template>
+              #elseif($column.htmlType == "fileUpload")## 文件上传
+                <template #${javaField}="{ row }">
+                  <FileUpload v-model:value="row.${javaField}" />
+                </template>
+              #elseif($column.htmlType == "select")## 下拉框
+                <template #${javaField}="{ row, column }">
+                  <Select v-model:value="row.${javaField}" class="w-full">
+                    <SelectOption v-for="option in column.params.options" :key="option.value" :value="option.value">
+                      {{ option.label }}
+                    </SelectOption>
+                  </Select>
+                </template>
+              #elseif($column.htmlType == "checkbox")## 多选框
+                <template #${javaField}="{ row, column }">
+                  <CheckboxGroup v-model:value="row.${javaField}" :options="column.params.options" />
+                </template>
+              #elseif($column.htmlType == "radio")## 单选框
+                <template #${javaField}="{ row, column }">
+                  <RadioGroup v-model:value="row.${javaField}" :options="column.params.options" />
+                </template>
+              #elseif($column.htmlType == "datetime")## 时间框
+                <template #${javaField}="{ row }">
+                  <DatePicker
+                      v-model:value="row.${javaField}"
+                      :showTime="true"
+                      format="YYYY-MM-DD HH:mm:ss"
+                      valueFormat='x'
+                  />
+                </template>
+              #elseif($column.htmlType == "textarea" || $column.htmlType == "editor")## 文本框
+                <template #${javaField}="{ row }">
+                  <TextArea v-model:value="row.${javaField}" />
+                </template>
+              #end
+          #end
+      #end
+    <template #actions="{ row }">
+      <Button
+          size="small"
+          type="link"
+          danger
+          @click="handleDelete(row)"
+          v-access:code="['${subTable.moduleName}:${simpleClassName_strikeCase}:delete']"
+      >
+        {{ $t('ui.actionTitle.delete') }}
+      </Button>
+    </template>
+  </Grid>
+  <div class="flex justify-center -mt-4">
+    <Button :icon="h(Plus)" type="primary" ghost @click="handleAdd" v-access:code="['${subTable.moduleName}:${simpleClassName_strikeCase}:create']">
+      {{ $t('ui.actionTitle.create', ['${subTable.classComment}']) }}
+    </Button>
+  </div>
+#else
+  <Form class="mx-4" />
+#end
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_erp.vue.vm
new file mode 100644
index 000000000..e85700d64
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_erp.vue.vm
@@ -0,0 +1,240 @@
+#set ($subTable = $subTables.get($subIndex))##当前表
+#set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组
+#set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
+#set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
+#set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
+#set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($subIndex))
+#set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api")
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ${apiName} } from '#/api/${table.moduleName}/${table.businessName}';
+
+#if ($table.templateType == 11) ## erp
+import ${subSimpleClassName}Form from './${subSimpleClassName_strikeCase}-form.vue'
+#end
+import { confirm, useVbenModal } from '@vben/common-ui';
+import { message } from 'antdv-next';
+import { ref, computed, nextTick,watch } from 'vue';
+import { $t } from '#/locales';
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+
+#if ($table.templateType == 11) ## erp
+import { delete${subSimpleClassName},#if ($deleteBatchEnable) delete${subSimpleClassName}List,#end get${subSimpleClassName}Page } from '#/api/${table.moduleName}/${table.businessName}';
+import { use${subSimpleClassName}GridFormSchema, use${subSimpleClassName}GridColumns } from '../data';
+import { isEmpty } from '@vben/utils';
+#else
+#if ($subTable.subJoinMany) ## 一对多
+import { get${subSimpleClassName}ListBy${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
+#else
+import { get${subSimpleClassName}By${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
+#end
+import { use${subSimpleClassName}GridColumns } from '../data';
+#end
+
+const props = defineProps<{
+  ${subJoinColumn.javaField}?: number // ${subJoinColumn.columnComment}（主表的关联字段）
+}>()
+
+#if ($table.templateType == 11) ## erp
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: ${subSimpleClassName}Form,
+  destroyOnClose: true,
+});
+
+/** 创建${subTable.classComment} */
+function handleCreate() {
+  if (!props.${subJoinColumn.javaField}){
+    message.warning("请先选择一个${table.classComment}!")
+    return
+  }
+  formModalApi.setData({${subJoinColumn.javaField}: props.${subJoinColumn.javaField}}).open();
+}
+
+/** 编辑${subTable.classComment} */
+function handleEdit(row: ${apiName}.${subSimpleClassName}) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除${subTable.classComment} */
+async function handleDelete(row: ${apiName}.${subSimpleClassName}) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.id]),
+    duration: 0,
+  });
+  try {
+    await delete${subSimpleClassName}(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+#if ($deleteBatchEnable)
+/** 批量删除${subTable.classComment} */
+async function handleDeleteBatch() {
+  await confirm($t('ui.actionMessage.deleteBatchConfirm'));
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deletingBatch'),
+    duration: 0,
+  });
+  try {
+    await delete${subSimpleClassName}List(checkedIds.value);
+    checkedIds.value = [];
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const checkedIds = ref<number[]>([])
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ${apiName}.${subSimpleClassName}[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+#end
+
+#end
+const [Grid, gridApi] = useVbenVxeGrid({
+#if ($table.templateType == 11)
+  formOptions: {
+    schema: use${subSimpleClassName}GridFormSchema(),
+  },
+#end
+  gridOptions: {
+#if ($table.templateType == 11)
+  columns: use${subSimpleClassName}GridColumns(),
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          if (!props.${subJoinColumn.javaField}){
+              return []
+          }
+          return await get${subSimpleClassName}Page({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ${subJoinColumn.javaField}: props.${subJoinColumn.javaField},
+            ...formValues,
+          });
+        },
+      },
+    },
+  pagerConfig: {
+    enabled: true,
+  },
+  toolbarConfig: {
+    refresh: true,
+    search: true,
+  },
+#else
+  columns: use${subSimpleClassName}GridColumns(),
+  pagerConfig: {
+    enabled: false,
+  },
+  toolbarConfig: {
+    enabled: false,
+  },
+#end
+  height: '600px',
+  rowConfig: {
+    keyField: 'id',
+    isHover: true,
+  },
+  } as VxeTableGridOptions<${apiName}.${subSimpleClassName}>,
+  #if (${table.templateType} == 11 && $deleteBatchEnable)
+  gridEvents:{
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  }
+  #end
+});
+
+/** 刷新表格 */
+async function handleRefresh() {
+#if ($table.templateType == 11) ## erp
+  await gridApi.query();
+#else
+  #if ($subTable.subJoinMany) ## 一对多
+  await gridApi.grid.loadData(await get${subSimpleClassName}ListBy${SubJoinColumnName}(props.${subJoinColumn.javaField}!));
+  #else
+  await gridApi.grid.loadData([await get${subSimpleClassName}By${SubJoinColumnName}(props.${subJoinColumn.javaField}!)]);
+  #end
+#end
+}
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.${subJoinColumn.javaField},
+  async (val) => {
+    if (!val) {
+      return;
+    }
+    await nextTick();
+    await handleRefresh()
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+    #if ($table.templateType == 11) ## erp
+      <FormModal @success="handleRefresh" />
+      <Grid table-title="${subTable.classComment}列表">
+        <template #toolbar-tools>
+          <TableAction
+            :actions="[
+              {
+                label: $t('ui.actionTitle.create', ['${table.classComment}']),
+                type: 'primary',
+                icon: ACTION_ICON.ADD,
+                auth: ['${table.moduleName}:${simpleClassName_strikeCase}:create'],
+                onClick: handleCreate,
+              },
+              #if ($table.templateType == 11 && $deleteBatchEnable)
+              {
+                label: $t('ui.actionTitle.deleteBatch'),
+                type: 'primary',
+                danger: true,
+                icon: ACTION_ICON.DELETE,
+                disabled: isEmpty(checkedIds),
+                auth: ['${table.moduleName}:${simpleClassName_strikeCase}:delete'],
+                onClick: handleDeleteBatch,
+              },
+              #end
+            ]"
+          />
+        </template>
+        <template #actions="{ row }">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'link',
+                icon: ACTION_ICON.EDIT,
+                auth: ['${table.moduleName}:${simpleClassName_strikeCase}:update'],
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'link',
+                danger: true,
+                icon: ACTION_ICON.DELETE,
+                auth: ['${table.moduleName}:${simpleClassName_strikeCase}:delete'],
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.id]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+            ]"
+          />
+        </template>
+      </Grid>
+    #else
+      <Grid table-title="${subTable.classComment}列表" />
+    #end
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_inner.vue.vm b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_inner.vue.vm
new file mode 100644
index 000000000..2d8aa202d
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-server/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_inner.vue.vm
@@ -0,0 +1,4 @@
+## 子表的 erp 和 inner 使用相似的 list 列表，差异主要两点：
+## 1）inner 使用 list 不分页，erp 使用 page 分页
+## 2）erp 支持单个子表的新增、修改、删除，inner 不支持
+#parse("codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm")
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl
index 2b485a438..31d689e12 100644
--- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl
+++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.demo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/recrod/IotAlertRecordPageReqVO.java b/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/recrod/IotAlertRecordPageReqVO.java
index 109f24091..b4039aa8e 100644
--- a/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/recrod/IotAlertRecordPageReqVO.java
+++ b/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/recrod/IotAlertRecordPageReqVO.java
@@ -17,7 +17,7 @@ public class IotAlertRecordPageReqVO extends PageParam {
     private Long configId;
 
     @Schema(description = "告警级别", example = "1")
-    private Integer level;
+    private Integer configLevel;
 
     @Schema(description = "产品编号", example = "2050")
     private Long productId;
diff --git a/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertRecordMapper.java b/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertRecordMapper.java
index f23fe60f7..0c8a4e454 100644
--- a/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertRecordMapper.java
+++ b/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertRecordMapper.java
@@ -22,7 +22,7 @@ public interface IotAlertRecordMapper extends BaseMapperX<IotAlertRecordDO> {
     default PageResult<IotAlertRecordDO> selectPage(IotAlertRecordPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotAlertRecordDO>()
                 .eqIfPresent(IotAlertRecordDO::getConfigId, reqVO.getConfigId())
-                .eqIfPresent(IotAlertRecordDO::getConfigLevel, reqVO.getLevel())
+                .eqIfPresent(IotAlertRecordDO::getConfigLevel, reqVO.getConfigLevel())
                 .eqIfPresent(IotAlertRecordDO::getProductId, reqVO.getProductId())
                 .eqIfPresent(IotAlertRecordDO::getDeviceId, reqVO.getDeviceId())
                 .eqIfPresent(IotAlertRecordDO::getProcessStatus, reqVO.getProcessStatus())
diff --git a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java
index debddcf3d..d4323c60d 100755
--- a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java
@@ -52,6 +52,9 @@ public class CouponTemplateServiceImpl implements CouponTemplateService {
 
     @Override
     public Long createCouponTemplate(CouponTemplateCreateReqVO createReqVO) {
+        // 校验发放数量不能小于每人限领数量（仅在 CouponTakeTypeEnum.USER 用户领取时）
+        validateTotalCountNotLessThanTakeLimitCount(createReqVO.getTakeType(), createReqVO.getTotalCount(),
+                createReqVO.getTakeLimitCount());
         // 校验商品范围
         validateProductScope(createReqVO.getProductScope(), createReqVO.getProductScopeValues());
         // 插入
@@ -66,8 +69,11 @@ public class CouponTemplateServiceImpl implements CouponTemplateService {
     public void updateCouponTemplate(CouponTemplateUpdateReqVO updateReqVO) {
         // 校验存在
         CouponTemplateDO couponTemplate = validateCouponTemplateExists(updateReqVO.getId());
+        // 校验发放数量不能小于每人限领数量（仅在 CouponTakeTypeEnum.USER 用户领取时）
+        validateTotalCountNotLessThanTakeLimitCount(updateReqVO.getTakeType(), updateReqVO.getTotalCount(),
+                updateReqVO.getTakeLimitCount());
         // 校验发放数量不能过小（仅在 CouponTakeTypeEnum.USER 用户领取时）
-        if (CouponTakeTypeEnum.isUser(couponTemplate.getTakeType())
+        if (CouponTakeTypeEnum.isUser(updateReqVO.getTakeType())
                 && !isTotalCountUnlimited(updateReqVO.getTotalCount()) // 非不限制总发放数量
                 && updateReqVO.getTotalCount() < couponTemplate.getTakeCount()) {
             throw exception(COUPON_TEMPLATE_TOTAL_COUNT_TOO_SMALL, couponTemplate.getTakeCount());
@@ -104,11 +110,21 @@ public class CouponTemplateServiceImpl implements CouponTemplateService {
         return couponTemplate;
     }
 
+    private void validateTotalCountNotLessThanTakeLimitCount(Integer takeType, Integer totalCount, Integer takeLimitCount) {
+        // 修复 https://gitee.com/yudaocode/yudao-mall-uniapp/issues/IJLP6Q 反馈
+        if (CouponTakeTypeEnum.isUser(takeType)
+                && !isTakeLimitCountUnlimited(takeLimitCount)
+                && !isTotalCountUnlimited(totalCount)
+                && takeLimitCount > totalCount) {
+            throw exception(COUPON_TEMPLATE_NOT_ENOUGH);
+        }
+    }
+
     private void validateProductScope(Integer productScope, List<Long> productScopeValues) {
         if (Objects.equals(PromotionProductScopeEnum.SPU.getScope(), productScope)) {
-            productSpuApi.validateSpuList(productScopeValues).checkError();
+            productSpuApi.validateSpuList(productScopeValues);
         } else if (Objects.equals(PromotionProductScopeEnum.CATEGORY.getScope(), productScope)) {
-            productCategoryApi.validateCategoryList(productScopeValues).checkError();
+            productCategoryApi.validateCategoryList(productScopeValues);
         }
     }
 
diff --git a/yudao-module-mall/yudao-module-promotion-server/src/test/resources/sql/create_tables.sql b/yudao-module-mall/yudao-module-promotion-server/src/test/resources/sql/create_tables.sql
index 00ac3f93d..5b566ce5b 100644
--- a/yudao-module-mall/yudao-module-promotion-server/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-mall/yudao-module-promotion-server/src/test/resources/sql/create_tables.sql
@@ -23,13 +23,14 @@ CREATE TABLE IF NOT EXISTS "promotion_coupon_template"
 (
     "id"                   bigint   NOT NULL GENERATED BY DEFAULT AS IDENTITY,
     "name"                 varchar  NOT NULL,
+    "description"          varchar,
     "status"               int      NOT NULL,
     "total_count"          int      NOT NULL,
     "take_limit_count"     int      NOT NULL,
     "take_type"            int      NOT NULL,
     "use_price"            int      NOT NULL,
     "product_scope"        int      NOT NULL,
-    "product_spu_ids"      varchar,
+    "product_scope_values" varchar,
     "validity_type"        int      NOT NULL,
     "valid_start_time"     datetime,
     "valid_end_time"       datetime,
@@ -57,11 +58,11 @@ CREATE TABLE IF NOT EXISTS "promotion_coupon"
     "status"               int      NOT NULL,
     "user_id"              bigint   NOT NULL,
     "take_type"            int      NOT NULL,
-    "useprice"             int      NOT NULL,
+    "use_price"            int      NOT NULL,
     "valid_start_time"     datetime NOT NULL,
     "valid_end_time"       datetime NOT NULL,
     "product_scope"        int      NOT NULL,
-    "product_spu_ids"      varchar,
+    "product_scope_values" varchar,
     "discount_type"        int      NOT NULL,
     "discount_percent"     int,
     "discount_price"       int,
@@ -112,6 +113,27 @@ CREATE TABLE IF NOT EXISTS "promotion_discount_activity"
     PRIMARY KEY ("id")
 ) COMMENT '限时折扣活动';
 
+CREATE TABLE IF NOT EXISTS "promotion_discount_product"
+(
+    "id"                  bigint   NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "activity_id"         bigint   NOT NULL,
+    "spu_id"              bigint   NOT NULL,
+    "sku_id"              bigint   NOT NULL,
+    "discount_type"       int      NOT NULL,
+    "discount_percent"    int,
+    "discount_price"      int,
+    "activity_name"       varchar  NOT NULL,
+    "activity_status"     int      NOT NULL,
+    "activity_start_time" datetime NOT NULL,
+    "activity_end_time"   datetime NOT NULL,
+    "creator"             varchar           DEFAULT '',
+    "create_time"         datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater"             varchar           DEFAULT '',
+    "update_time"         datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    "deleted"             bit      NOT NULL DEFAULT FALSE,
+    PRIMARY KEY ("id")
+) COMMENT '限时折扣商品';
+
 CREATE TABLE IF NOT EXISTS "promotion_seckill_activity"
 (
     "id"                 bigint   NOT NULL GENERATED BY DEFAULT AS IDENTITY,
@@ -253,4 +275,4 @@ CREATE TABLE IF NOT EXISTS "promotion_diy_page"
     "deleted"            bit      NOT NULL DEFAULT FALSE,
     "tenant_id"          bigint   NOT NULL,
     PRIMARY KEY ("id")
-) COMMENT '装修页面';
\ No newline at end of file
+) COMMENT '装修页面';