From df69fecbb4a7fbd3b671dd22b72e17258dc3c82c Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 17 Nov 2023 17:03:35 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E9=87=8D=E6=9E=84=20vue2=20=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=EF=BC=8C=E9=80=82=E9=85=8D=E6=A0=91=E8=A1=A8=E5=92=8C=E4=B8=BB?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=EF=BC=8880%=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/mysql/ruoyi-vue-pro.sql                   |   5 +
 .../main/resources/codegen/vue/api/api.js.vm  | 102 ++++-
 .../vue/views/components/form_sub_erp.vue.vm  | 204 ++++++++++
 .../views/components/form_sub_inner.vue.vm    |   2 +
 .../views/components/form_sub_normal.vue.vm   | 362 ++++++++++++++++++
 .../vue/views/components/list_sub_erp.vue.vm  | 181 +++++++++
 .../views/components/list_sub_inner.vue.vm    |   4 +
 .../resources/codegen/vue/views/form.vue.vm   | 333 ++++++++++++++++
 .../resources/codegen/vue/views/index.vue.vm  | 340 ++++++++--------
 .../resources/codegen/vue3/views/form.vue.vm  |   2 +
 .../resources/codegen/vue3/views/index.vue.vm |  12 +-
 .../src/main/resources/application-local.yaml |   8 +-
 12 files changed, 1351 insertions(+), 204 deletions(-)
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm

diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql
index 7b13fbec0..ce201e19b 100644
--- a/sql/mysql/ruoyi-vue-pro.sql
+++ b/sql/mysql/ruoyi-vue-pro.sql
@@ -450,6 +450,11 @@ CREATE TABLE `infra_codegen_table`  (
   `template_type` tinyint NOT NULL DEFAULT 1 COMMENT '模板类型',
   `front_type` tinyint NOT NULL COMMENT '前端类型',
   `parent_menu_id` bigint NULL DEFAULT NULL COMMENT '父菜单编号',
+  `master_table_id` bigint NULL DEFAULT NULL COMMENT '主表的编号',
+  `sub_join_column_id` bigint NULL DEFAULT NULL COMMENT '【自己】子表关联主表的字段编号',
+  `sub_join_many` bit(1) NULL DEFAULT NULL COMMENT '主表与子表是否一对多',
+  `tree_parent_column_id` bigint NULL DEFAULT NULL COMMENT '树表的父字段编号',
+  `tree_name_column_id` bigint NULL DEFAULT NULL COMMENT '树表的名字字段编号',
   `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm
index 5e9da3238..fdafffd54 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm
@@ -35,21 +35,113 @@ export function get${simpleClassName}(id) {
   })
 }
 
+#if ( $table.templateType != 2 )
 // 获得${table.classComment}分页
-export function get${simpleClassName}Page(query) {
+export function get${simpleClassName}Page(params) {
   return request({
     url: '${baseURL}/page',
     method: 'get',
-    params: query
+    params
   })
 }
-
+#else
+// 获得${table.classComment}列表
+export function get${simpleClassName}List(params) {
+  return request({
+    url: '${baseURL}/list',
+    method: 'get',
+    params
+  })
+}
+#end
 // 导出${table.classComment} Excel
-export function export${simpleClassName}Excel(query) {
+export function export${simpleClassName}Excel(params) {
   return request({
     url: '${baseURL}/export-excel',
     method: 'get',
-    params: query,
+    params,
     responseType: 'blob'
   })
 }
+## 特殊：主子表专属逻辑
+#foreach ($subTable in $subTables)
+  #set ($index = $foreach.count - 1)
+  #set ($subSimpleClassName = $subSimpleClassNames.get($index))
+  #set ($subPrimaryColumn = $subPrimaryColumns.get($index))##当前 primary 字段
+  #set ($subJoinColumn = $subJoinColumns.get($index))##当前 join 字段
+  #set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+  #set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($index))
+  #set ($subJoinColumn_strikeCase = $subJoinColumn_strikeCases.get($index))
+  #set ($subClassNameVar = $subClassNameVars.get($index))
+
+// ==================== 子表（$subTable.classComment） ====================
+  ## 情况一：MASTER_ERP 时，需要分查询页子表
+  #if ( $table.templateType == 11 )
+
+  // 获得${subTable.classComment}分页
+  export function get${simpleClassName}Page(params) {
+    return request({
+      url: '${baseURL}/${subSimpleClassName_strikeCase}/page',
+      method: 'get',
+      params
+    })
+  }
+    ## 情况二：非 MASTER_ERP 时，需要列表查询子表
+  #else
+    #if ( $subTable.subJoinMany )
+
+    // 获得${subTable.classComment}列表
+    export function get${subSimpleClassName}ListBy${SubJoinColumnName}(${subJoinColumn.javaField}) {
+      return request({
+        url: `${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=` + ${subJoinColumn.javaField},
+        method: 'get'
+      })
+    }
+    #else
+
+    // 获得${subTable.classComment}
+    export function get${subSimpleClassName}By${SubJoinColumnName}(${subJoinColumn.javaField}) {
+      return request({
+        url: `${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=` + ${subJoinColumn.javaField},
+        method: 'get'
+      })
+    }
+    #end
+  #end
+  ## 特殊：MASTER_ERP 时，支持单个的新增、修改、删除操作
+  #if ( $table.templateType == 11 )
+  // 新增${subTable.classComment}
+  export function create${subSimpleClassName}(data) {
+    return request({
+      url: `${baseURL}/${subSimpleClassName_strikeCase}/create`,
+      method: 'post',
+      data
+    })
+  }
+
+  // 修改${subTable.classComment}
+  export function update${subSimpleClassName}(data) {
+    return request({
+      url: `${baseURL}/${subSimpleClassName_strikeCase}/update`,
+      method: 'post',
+      data
+    })
+  }
+
+  // 删除${subTable.classComment}
+  export function delete${subSimpleClassName}(id) {
+    return request({
+      url: `${baseURL}/${subSimpleClassName_strikeCase}/delete?id=` + id,
+      method: 'delete'
+    })
+  }
+
+  // 获得${subTable.classComment}
+  export function get${subSimpleClassName}(id) {
+    return request({
+      url: `${baseURL}/${subSimpleClassName_strikeCase}/get?id=` + id,
+      method: 'get'
+    })
+  }
+  #end
+#end
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
new file mode 100644
index 000000000..c1b4a0a0f
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
@@ -0,0 +1,204 @@
+#set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组
+#set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
+#set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
+<template>
+  <Dialog :title="dialogTitle" :visible.sync="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+#foreach($column in $subColumns)
+    #if ($column.createOperation || $column.updateOperation)
+        #set ($dictType = $column.dictType)
+        #set ($javaField = $column.javaField)
+        #set ($javaType = $column.javaType)
+        #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+        #set ($comment = $column.columnComment)
+        #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
+        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+            #set ($dictMethod = "getIntDictOptions")
+        #elseif ($javaType == "String")
+            #set ($dictMethod = "getStrDictOptions")
+        #elseif ($javaType == "Boolean")
+            #set ($dictMethod = "getBoolDictOptions")
+        #end
+        #if ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里 TODO 芋艿：这里要忽略下 join 字段；
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
+      </el-form-item>
+        #elseif($column.htmlType == "imageUpload")## 图片上传
+      <el-form-item label="${comment}" prop="${javaField}">
+        <UploadImg v-model="formData.${javaField}" />
+      </el-form-item>
+        #elseif($column.htmlType == "fileUpload")## 文件上传
+      <el-form-item label="${comment}" prop="${javaField}">
+        <UploadFile v-model="formData.${javaField}" />
+      </el-form-item>
+        #elseif($column.htmlType == "editor")## 文本编辑器
+      <el-form-item label="${comment}" prop="${javaField}">
+        <Editor v-model="formData.${javaField}" height="150px" />
+      </el-form-item>
+        #elseif($column.htmlType == "select")## 下拉框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
+                #if ("" != $dictType)## 有数据字典
+          <el-option
+            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+                #else##没数据字典
+          <el-option label="请选择字典生成" value="" />
+                #end
+        </el-select>
+      </el-form-item>
+        #elseif($column.htmlType == "checkbox")## 多选框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-checkbox-group v-model="formData.${javaField}">
+                #if ("" != $dictType)## 有数据字典
+          <el-checkbox
+            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-checkbox>
+                #else##没数据字典
+          <el-checkbox>请选择字典生成</el-checkbox>
+                #end
+        </el-checkbox-group>
+      </el-form-item>
+        #elseif($column.htmlType == "radio")## 单选框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-radio-group v-model="formData.${javaField}">
+                #if ("" != $dictType)## 有数据字典
+          <el-radio
+            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+                #else##没数据字典
+          <el-radio label="1">请选择字典生成</el-radio>
+                #end
+        </el-radio-group>
+      </el-form-item>
+        #elseif($column.htmlType == "datetime")## 时间框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-date-picker
+          v-model="formData.${javaField}"
+          type="date"
+          value-format="x"
+          placeholder="选择${comment}"
+        />
+      </el-form-item>
+        #elseif($column.htmlType == "textarea")## 文本框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
+      </el-form-item>
+        #end
+    #end
+#end
+    </el-form>
+    <template v-slot:footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+#foreach ($column in $subColumns)
+    #if ($column.createOperation || $column.updateOperation)
+      #if ($column.htmlType == "checkbox")
+  $column.javaField: [],
+      #else
+  $column.javaField: undefined,
+      #end
+    #end
+#end
+})
+const formRules = reactive({
+#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 formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number, ${subJoinColumn.javaField}: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  formData.value.${subJoinColumn.javaField} = ${subJoinColumn.javaField}
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ${simpleClassName}Api.get${subSimpleClassName}(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value
+    if (formType.value === 'create') {
+      await ${simpleClassName}Api.create${subSimpleClassName}(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ${simpleClassName}Api.update${subSimpleClassName}(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const 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>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm
new file mode 100644
index 000000000..d8542c3d5
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm
@@ -0,0 +1,2 @@
+## 主表的 normal 和 inner 使用相同的 form 表单
+#parse("codegen/vue3/views/components/form_sub_normal.vue.vm")
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
new file mode 100644
index 000000000..90df79812
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
@@ -0,0 +1,362 @@
+#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 ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+<template>
+#if ( $subTable.subJoinMany )## 情况一：一对多，table + form
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    v-loading="formLoading"
+    label-width="0px"
+    :inline-message="true"
+  >
+    <el-table :data="formData" class="-mt-10px">
+      <el-table-column label="序号" type="index" width="100" />
+#foreach($column in $subColumns)
+    #if ($column.createOperation || $column.updateOperation)
+        #set ($dictType = $column.dictType)
+        #set ($javaField = $column.javaField)
+        #set ($javaType = $column.javaType)
+        #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+        #set ($comment = $column.columnComment)
+        #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
+        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+            #set ($dictMethod = "getIntDictOptions")
+        #elseif ($javaType == "String")
+            #set ($dictMethod = "getStrDictOptions")
+        #elseif ($javaType == "Boolean")
+            #set ($dictMethod = "getBoolDictOptions")
+        #end
+        #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+        #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+      <el-table-column label="${comment}" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+            <el-input v-model="row.${javaField}" placeholder="请输入${comment}" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+        #elseif($column.htmlType == "imageUpload")## 图片上传
+      <el-table-column label="${comment}" min-width="200">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+            <UploadImg v-model="row.${javaField}" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+        #elseif($column.htmlType == "fileUpload")## 文件上传
+      <el-table-column label="${comment}" min-width="200">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+            <UploadFile v-model="row.${javaField}" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+        #elseif($column.htmlType == "editor")## 文本编辑器
+      <el-table-column label="${comment}" min-width="400">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+            <Editor v-model="row.${javaField}" height="150px" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+        #elseif($column.htmlType == "select")## 下拉框
+      <el-table-column label="${comment}" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+            <el-select v-model="row.${javaField}" placeholder="请选择${comment}">
+              #if ("" != $dictType)## 有数据字典
+                <el-option
+                  v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              #else##没数据字典
+                <el-option label="请选择字典生成" value="" />
+              #end
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+        #elseif($column.htmlType == "checkbox")## 多选框
+      <el-table-column label="${comment}" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+            <el-checkbox-group v-model="row.${javaField}">
+              #if ("" != $dictType)## 有数据字典
+                <el-checkbox
+                  v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+                  :key="dict.value"
+                  :label="dict.value"
+                >
+                  {{ dict.label }}
+                </el-checkbox>
+              #else##没数据字典
+                <el-checkbox>请选择字典生成</el-checkbox>
+              #end
+            </el-checkbox-group>
+          </el-form-item>
+        </template>
+      </el-table-column>
+        #elseif($column.htmlType == "radio")## 单选框
+      <el-table-column label="${comment}" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+            <el-radio-group v-model="row.${javaField}">
+              #if ("" != $dictType)## 有数据字典
+                <el-radio
+                  v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+                  :key="dict.value"
+                  :label="dict.value"
+                >
+                  {{ dict.label }}
+                </el-radio>
+              #else##没数据字典
+                <el-radio label="1">请选择字典生成</el-radio>
+              #end
+            </el-radio-group>
+          </el-form-item>
+        </template>
+      </el-table-column>
+        #elseif($column.htmlType == "datetime")## 时间框
+      <el-table-column label="${comment}" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+            <el-date-picker
+              v-model="row.${javaField}"
+              type="date"
+              value-format="x"
+              placeholder="选择${comment}"
+            />
+          </el-form-item>
+        </template>
+      </el-table-column>
+        #elseif($column.htmlType == "textarea")## 文本框
+      <el-table-column label="${comment}" min-width="200">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+            <el-input v-model="row.${javaField}" type="textarea" placeholder="请输入${comment}" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+        #end
+    #end
+#end
+      <el-table-column align="center" fixed="right" label="操作" width="60">
+        <template #default="{ $index }">
+          <el-button @click="handleDelete($index)" link>—</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <el-row justify="center" class="mt-3">
+    <el-button @click="handleAdd" round>+ 添加${subTable.classComment}</el-button>
+  </el-row>
+#else## 情况二：一对一，form
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    label-width="100px"
+    v-loading="formLoading"
+  >
+#foreach($column in $subColumns)
+  #if ($column.createOperation || $column.updateOperation)
+  #set ($dictType = $column.dictType)
+      #set ($javaField = $column.javaField)
+      #set ($javaType = $column.javaType)
+      #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+      #set ($comment = $column.columnComment)
+      #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
+      #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+        #set ($dictMethod = "getIntDictOptions")
+      #elseif ($javaType == "String")
+          #set ($dictMethod = "getStrDictOptions")
+      #elseif ($javaType == "Boolean")
+          #set ($dictMethod = "getBoolDictOptions")
+      #end
+      #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+      #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+    <el-form-item label="${comment}" prop="${javaField}">
+      <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
+    </el-form-item>
+      #elseif($column.htmlType == "imageUpload")## 图片上传
+    <el-form-item label="${comment}" prop="${javaField}">
+      <UploadImg v-model="formData.${javaField}" />
+    </el-form-item>
+      #elseif($column.htmlType == "fileUpload")## 文件上传
+    <el-form-item label="${comment}" prop="${javaField}">
+      <UploadFile v-model="formData.${javaField}" />
+    </el-form-item>
+      #elseif($column.htmlType == "editor")## 文本编辑器
+    <el-form-item label="${comment}" prop="${javaField}">
+      <Editor v-model="formData.${javaField}" height="150px" />
+    </el-form-item>
+      #elseif($column.htmlType == "select")## 下拉框
+    <el-form-item label="${comment}" prop="${javaField}">
+      <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
+              #if ("" != $dictType)## 有数据字典
+        <el-option
+          v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+              #else##没数据字典
+        <el-option label="请选择字典生成" value="" />
+              #end
+      </el-select>
+    </el-form-item>
+      #elseif($column.htmlType == "checkbox")## 多选框
+    <el-form-item label="${comment}" prop="${javaField}">
+      <el-checkbox-group v-model="formData.${javaField}">
+              #if ("" != $dictType)## 有数据字典
+        <el-checkbox
+          v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+          :key="dict.value"
+          :label="dict.value"
+        >
+          {{ dict.label }}
+        </el-checkbox>
+              #else##没数据字典
+        <el-checkbox>请选择字典生成</el-checkbox>
+              #end
+      </el-checkbox-group>
+    </el-form-item>
+      #elseif($column.htmlType == "radio")## 单选框
+    <el-form-item label="${comment}" prop="${javaField}">
+      <el-radio-group v-model="formData.${javaField}">
+              #if ("" != $dictType)## 有数据字典
+        <el-radio
+          v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+          :key="dict.value"
+          :label="dict.value"
+          >
+          {{ dict.label }}
+        </el-radio>
+              #else##没数据字典
+        <el-radio label="1">请选择字典生成</el-radio>
+              #end
+      </el-radio-group>
+    </el-form-item>
+      #elseif($column.htmlType == "datetime")## 时间框
+    <el-form-item label="${comment}" prop="${javaField}">
+      <el-date-picker
+        v-model="formData.${javaField}"
+        type="date"
+        value-format="x"
+        placeholder="选择${comment}"
+      />
+    </el-form-item>
+      #elseif($column.htmlType == "textarea")## 文本框
+    <el-form-item label="${comment}" prop="${javaField}">
+      <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
+    </el-form-item>
+      #end
+  #end
+#end
+  </el-form>
+#end
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+
+const props = defineProps<{
+  ${subJoinColumn.javaField}: undefined // ${subJoinColumn.columnComment}（主表的关联字段）
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref([])
+const formRules = reactive({
+#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 formRef = ref() // 表单 Ref
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.${subJoinColumn.javaField},
+  async (val) => {
+    // 1. 重置表单
+#if ( $subTable.subJoinMany )
+    formData.value = []
+#else
+    formData.value = {
+    #foreach ($column in $subColumns)
+      #if ($column.createOperation || $column.updateOperation)
+        #if ($column.htmlType == "checkbox")
+      $column.javaField: [],
+        #else
+      $column.javaField: undefined,
+        #end
+      #end
+    #end
+    }
+#end
+    // 2. val 非空，则加载数据
+    if (!val) {
+      return;
+    }
+    try {
+      formLoading.value = true
+#if ( $subTable.subJoinMany )
+      formData.value = await ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(val)
+#else
+      const data = await ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(val)
+      if (!data) {
+        return
+      }
+      formData.value = data
+#end
+    } finally {
+      formLoading.value = false
+    }
+  },
+  { immediate: true }
+)
+#if ( $subTable.subJoinMany )
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  const row = {
+#foreach ($column in $subColumns)
+    #if ($column.createOperation || $column.updateOperation)
+      #if ($column.htmlType == "checkbox")
+    $column.javaField: [],
+      #else
+    $column.javaField: undefined,
+      #end
+  #end
+#end
+  }
+  row.${subJoinColumn.javaField} = props.${subJoinColumn.javaField}
+  formData.value.push(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (index) => {
+  formData.value.splice(index, 1)
+}
+#end
+
+/** 表单校验 */
+const validate = () => {
+  return formRef.value.validate()
+}
+
+/** 表单值 */
+const getData = () => {
+  return formData.value
+}
+
+defineExpose({ validate, getData })
+</script>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
new file mode 100644
index 000000000..5ad208b3b
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
@@ -0,0 +1,181 @@
+#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 ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+<template>
+  <!-- 列表 -->
+  <ContentWrap>
+#if ($table.templateType == 11)
+    <el-button
+      type="primary"
+      plain
+      @click="openForm('create')"
+      v-hasPermi="['${permissionPrefix}:create']"
+    >
+      <Icon icon="ep:plus" class="mr-5px" /> 新增
+    </el-button>
+#end
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      #foreach($column in $subColumns)
+      #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.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+        #elseif ($column.javaType == "LocalDateTime")## 时间类型
+      <el-table-column
+        label="${comment}"
+        align="center"
+        prop="${javaField}"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+        #elseif($column.dictType && "" != $column.dictType)## 数据字典
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.${column.javaField}" />
+        </template>
+      </el-table-column>
+        #else
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+        #end
+      #end
+    #end
+    #if ($table.templateType == 11)
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['${permissionPrefix}:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['${permissionPrefix}:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    #end
+    </el-table>
+    #if ($table.templateType == 11)
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+    #end
+  </ContentWrap>
+#if ($table.templateType == 11)
+    <!-- 表单弹窗：添加/修改 -->
+    <${subSimpleClassName}Form ref="formRef" @success="getList" />
+#end
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+#if ($table.templateType == 11)
+import ${subSimpleClassName}Form from './${subSimpleClassName}Form.vue'
+#end
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const props = defineProps<{
+  ${subJoinColumn.javaField}: undefined // ${subJoinColumn.columnComment}（主表的关联字段）
+}>()
+const loading = ref(false) // 列表的加载中
+const list = ref([]) // 列表的数据
+#if ($table.templateType == 11)
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  ${subJoinColumn.javaField}: undefined
+})
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.${subJoinColumn.javaField},
+  (val) => {
+    queryParams.${subJoinColumn.javaField} = val
+    handleQuery()
+  },
+  { immediate: false }
+)
+#end
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+#if ($table.templateType == 11)
+    const data = await ${simpleClassName}Api.get${subSimpleClassName}Page(queryParams)
+    list.value = data.list
+    total.value = data.total
+#else
+  #if ( $subTable.subJoinMany )
+    list.value = await ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(props.${subJoinColumn.javaField})
+  #else
+    const data = await ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(props.${subJoinColumn.javaField})
+    if (!data) {
+      return
+    }
+    list.value.push(data)
+  #end
+#end
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+#if ($table.templateType == 11)
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  if (!props.${subJoinColumn.javaField}) {
+    message.error('请选择一个${table.classComment}')
+    return
+  }
+  formRef.value.open(type, id, props.${subJoinColumn.javaField})
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ${simpleClassName}Api.delete${subSimpleClassName}(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+#end
+#if ($table.templateType != 11)
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+#end
+</script>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm
new file mode 100644
index 000000000..3fe648892
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm
@@ -0,0 +1,4 @@
+## 子表的 erp 和 inner 使用相似的 list 列表，差异主要两点：
+## 1）inner 使用 list 不分页，erp 使用 page 分页
+## 2）erp 支持单个子表的新增、修改、删除，inner 不支持
+#parse("codegen/vue3/views/components/list_sub_erp.vue.vm")
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
new file mode 100644
index 000000000..7be0ed089
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
@@ -0,0 +1,333 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="500px" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="80px">
+          #foreach($column in $columns)
+              #if ($column.createOperation || $column.updateOperation)
+                  #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 ( $table.templateType == 2 && $column.id == $treeParentColumn.id )
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <treeselect
+                          v-model="formData.${javaField}"
+                          :options="${classNameVar}Tree"
+                          :normalizer="normalizer"
+                          placeholder="请选择${comment}"
+                      />
+                    </el-form-item>
+                  #elseif ($column.htmlType == "input" && !$column.primaryKey)
+                      #if (!$column.primaryKey)## 忽略主键，不用在表单里
+                        <el-form-item label="${comment}" prop="${javaField}">
+                          <el-input v-model="form.${javaField}" placeholder="请输入${comment}" />
+                        </el-form-item>
+                      #end
+                  #elseif($column.htmlType == "imageUpload")## 图片上传
+                      #set ($hasImageUploadColumn = true)
+                    <el-form-item label="${comment}">
+                      <imageUpload v-model="form.${javaField}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "fileUpload")## 文件上传
+                      #set ($hasFileUploadColumn = true)
+                    <el-form-item label="${comment}">
+                      <fileUpload v-model="form.${javaField}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "editor")## 文本编辑器
+                      #set ($hasEditorColumn = true)
+                    <el-form-item label="${comment}">
+                      <editor v-model="form.${javaField}" :min-height="192"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "select")## 下拉框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-select v-model="form.${javaField}" placeholder="请选择${comment}">
+                          #if ("" != $dictType)## 有数据字典
+                            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                       :key="dict.value" :label="dict.label" #if ($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end />
+                          #else##没数据字典
+                            <el-option label="请选择字典生成" value="" />
+                          #end
+                      </el-select>
+                    </el-form-item>
+                  #elseif($column.htmlType == "checkbox")## 多选框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-checkbox-group v-model="form.${javaField}">
+                          #if ("" != $dictType)## 有数据字典
+                            <el-checkbox v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                         :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-checkbox>
+                          #else##没数据字典
+                            <el-checkbox>请选择字典生成</el-checkbox>
+                          #end
+                      </el-checkbox-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "radio")## 单选框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-radio-group v-model="form.${javaField}">
+                          #if ("" != $dictType)## 有数据字典
+                            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                      :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"
+                                      #else:label="dict.value"#end>{{dict.label}}</el-radio>
+                          #else##没数据字典
+                            <el-radio label="1">请选择字典生成</el-radio>
+                          #end
+                      </el-radio-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "datetime")## 时间框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-date-picker clearable v-model="form.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
+                    </el-form-item>
+                  #elseif($column.htmlType == "textarea")## 文本框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-input v-model="form.${javaField}" type="textarea" placeholder="请输入内容" />
+                    </el-form-item>
+                  #end
+              #end
+          #end
+      </el-form>
+        ## 特殊：主子表专属逻辑
+        #if ( $subTables && $subTables.size() > 0 )
+          <!-- 子表的表单 -->
+          <el-tabs v-model="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))
+                <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
+                  <${subSimpleClassName}Form ref="${subClassNameVar}FormRef" :${subJoinColumn_strikeCase}="formData.id" />
+                </el-tab-pane>
+              #end
+          </el-tabs>
+        #end
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+  #if ($hasImageUploadColumn)
+  import ImageUpload from '@/components/ImageUpload';
+  #end
+  #if ($hasFileUploadColumn)
+  import FileUpload from '@/components/FileUpload';
+  #end
+  #if ($hasEditorColumn)
+  import Editor from '@/components/Editor';
+  #end
+  ## 特殊：树表专属逻辑
+  #if ( $table.templateType == 2 )
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  #end
+  ## 特殊：主子表专属逻辑
+  #if ( $subTables && $subTables.size() > 0 )
+  #foreach ($subSimpleClassName in $subSimpleClassNames)
+  import ${subSimpleClassName}Form from './components/${subSimpleClassName}Form.vue'
+  #end
+  #end
+  export default {
+    name: "${simpleClassName}",
+    components: {
+        #if ($hasImageUploadColumn)
+          ImageUpload,
+        #end
+        #if ($hasFileUploadColumn)
+          FileUpload,
+        #end
+        #if ($hasEditorColumn)
+          Editor,
+        #end
+        ## 特殊：树表专属逻辑
+        #if ( $table.templateType == 2 )
+          Treeselect,
+        #end
+        ## 特殊：主子表专属逻辑
+        #if ( $subTables && $subTables.size() > 0 )
+        #foreach ($subSimpleClassName in $subSimpleClassNames)
+          ${subSimpleClassName}Form,
+        #end
+        #end
+    },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+            #foreach ($column in $columns)
+                #if ($column.createOperation || $column.updateOperation)
+                    #if ($column.htmlType == "checkbox")
+                            $column.javaField: [],
+                    #else
+                            $column.javaField: undefined,
+                    #end
+                #end
+            #end
+        },
+        // 表单校验
+        formRules: {
+            #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 )
+             ${classNameVar}Tree: [], // 树形结构
+          #end
+          ## 特殊：主子表专属逻辑
+          #if ( $subTables && $subTables.size() > 0 )
+            /** 子表的表单 */
+             subTabsName: '$subClassNameVars.get(0)'
+          #end
+      };
+    },
+    methods: {
+        ## 特殊：树表专属逻辑
+        #if ( $table.templateType == 2 )
+          /** 转换${table.classComment}数据结构 */
+          normalizer(node) {
+            if (node.children && !node.children.length) {
+              delete node.children;
+            }
+            return {
+              id: node.id,
+              label: node.name,
+              children: node.children
+            };
+          },
+        #end
+      /** 表单重置 */
+      reset() {
+        this.formData = {
+            #foreach ($column in $columns)
+                #if ($column.createOperation || $column.updateOperation)
+                    #if ($column.htmlType == "checkbox")
+                            $column.javaField: [],
+                    #else
+                            $column.javaField: undefined,
+                    #end
+                #end
+            #end
+        };
+        this.resetForm("formRef");
+      },
+      /** 打开弹窗 */
+     open(id) {
+        this.dialogVisible = true;
+        this.reset();
+        const that = this;
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+            ${simpleClassName}Api.get${simpleClassName}(id).then(res=>{
+              that.formData = res.data;
+              that.title = "修改${table.classComment}";
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.title = "新增${table.classComment}";
+        ## 特殊：树表专属逻辑
+        #if ( $table.templateType == 2 )
+            this.get${simpleClassName}Tree()
+        #end
+      },
+        ## 特殊：树表专属逻辑
+        #if ( $table.templateType == 2 )
+          /** 获得${table.classComment}树 */
+          get${simpleClassName}Tree() {
+            const that = this;
+            that.${classNameVar}Tree = [];
+            ${simpleClassName}Api.get${simpleClassName}List().then(res=>{
+              const root = { id: 0, name: '顶级${table.classComment}', children: [] };
+              root.children = this.handleTree(res.data, 'id', '${treeParentColumn.javaField}')
+              that.${classNameVar}Tree.push(root)
+            });
+          },
+        #end
+
+      /** 提交按钮 */
+      submitForm() {
+        this.formLoading = true;
+        try {
+          let data = this.formData;
+## 特殊：主子表专属逻辑
+#if ( $subTables && $subTables.size() > 0 )
+          // 需要校验的表单 ref
+          const validFormRefArr = [
+              #foreach ($subTable in $subTables)
+                  #set ($index = $foreach.count - 1)
+                  #set ($subClassNameVar = $subClassNameVars.get($index))
+                "${subClassNameVar}FormRef",
+              #end
+          ];
+
+          const validArr = []; // 校验
+          const that = this;
+          validFormRefArr.forEach((item, index) => {
+            validArr.push(new Promise((resolve, reject) => {
+              that.getRef(item).validate(valid => {
+                if (valid){ // 校验成功
+                  resolve()
+                }else {
+                  reject(item.replace("FormRef","")) // 校验失败返回对应的表单
+                }
+              })
+            }))})
+          Promise.all(validArr).then(() => {
+            // 全部校验通过-拼接子表的数据
+            // 拼接子表的数据
+              #foreach ($subTable in $subTables)
+                  #set ($index = $foreach.count - 1)
+                  #set ($subClassNameVar = $subClassNameVars.get($index))
+                data.${subClassNameVar}#if ( $subTable.subJoinMany)s#end = that.getRef(${subClassNameVar}FormRef).getData()
+              #end
+          }).catch((err)=>{
+            that.subTabsName = err
+          })
+#end
+
+        this.getRef("formRef").validate(valid => {
+          if (!valid) {
+            return;
+          }
+          // 修改的提交
+          if (data.${primaryColumn.javaField}) {
+            ${simpleClassName}Api.update${simpleClassName}(data).then(response => {
+              this.#[[$modal]]#.msgSuccess("修改成功");
+              this.dialogVisible = false;
+              this.#[[$]]#emit('success');
+            });
+            return;
+          }
+          // 添加的提交
+          ${simpleClassName}Api.create${simpleClassName}(data).then(response => {
+            this.#[[$modal]]#.msgSuccess("新增成功");
+            this.dialogVisible = false;
+            this.#[[$]]#emit('success');
+          });
+        });
+        }finally {
+          this.formLoading = false
+        }
+      },
+      getRef(refName){
+        this.#[[$]]#refs[refName]
+      }
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
index 7a6add604..58b41890d 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
@@ -47,18 +47,67 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
                    v-hasPermi="['${permissionPrefix}:create']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                    v-hasPermi="['${permissionPrefix}:export']">导出</el-button>
       </el-col>
+        #if ( $table.templateType == 2 )
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">
+              展开/折叠
+            </el-button>
+          </el-col>
+        #end
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
+      ## 特殊：主子表专属逻辑 TODO puhui999: 普通模式
+      #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
+      <el-table
+          v-loading="loading"
+          :data="list"
+          :stripe="true"
+          :highlight-current-row="true"
+          :show-overflow-tooltip="true"
+          @current-change="handleCurrentChange"
+      >
+          ## 特殊：树表专属逻辑
+      #elseif ( $table.templateType == 2 )
+      <el-table
+          v-loading="loading"
+          :data="list"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          v-if="refreshTable"
+          row-key="id"
+          :default-expand-all="isExpandAll"
+          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      >
+      #else
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      #end
+      ## 特殊：主子表专属逻辑 TODO puhui999: 内嵌模式
+      #if ( $table.templateType == 12 && $subTables && $subTables.size() > 0 )
+        <!-- 子表的列表 -->
+        <el-table-column type="expand">
+          <template #default="scope">
+            <el-tabs value="$subClassNameVars.get(0)">
+                #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))
+                  <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
+                    <${subSimpleClassName}List :${subJoinColumn_strikeCase}="scope.row.id" />
+                  </el-tab-pane>
+                #end
+            </el-tabs>
+          </template>
+        </el-table-column>
+      #end
 #foreach($column in $columns)
 #if ($column.listOperationResult)
     #set ($dictType=$column.dictType)
@@ -84,7 +133,7 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.${primaryColumn.javaField})"
                      v-hasPermi="['${permissionPrefix}:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['${permissionPrefix}:delete']">删除</el-button>
@@ -96,90 +145,28 @@
                 @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#if ($column.createOperation || $column.updateOperation)
-    #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.htmlType == "input")
-  #if (!$column.primaryKey)## 忽略主键，不用在表单里
-        <el-form-item label="${comment}" prop="${javaField}">
-          <el-input v-model="form.${javaField}" placeholder="请输入${comment}" />
-        </el-form-item>
+    <${simpleClassName}Form ref="formRef" @success="getList" />
+  ## 特殊：主子表专属逻辑  TODO puhui999: ERP 模式
+  #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
+    <!-- 子表的列表 -->
+      <el-tabs model-value="$subClassNameVars.get(0)">
+          #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))
+            <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
+              <${subSimpleClassName}List :${subJoinColumn_strikeCase}="currentRow.id" />
+            </el-tab-pane>
+          #end
+      </el-tabs>
   #end
-#elseif($column.htmlType == "imageUpload")## 图片上传
-        #set ($hasImageUploadColumn = true)
-        <el-form-item label="${comment}">
-          <imageUpload v-model="form.${javaField}"/>
-        </el-form-item>
-#elseif($column.htmlType == "fileUpload")## 文件上传
-        #set ($hasFileUploadColumn = true)
-        <el-form-item label="${comment}">
-          <fileUpload v-model="form.${javaField}"/>
-        </el-form-item>
-#elseif($column.htmlType == "editor")## 文本编辑器
-        #set ($hasEditorColumn = true)
-        <el-form-item label="${comment}">
-          <editor v-model="form.${javaField}" :min-height="192"/>
-        </el-form-item>
-#elseif($column.htmlType == "select")## 下拉框
-        <el-form-item label="${comment}" prop="${javaField}">
-          <el-select v-model="form.${javaField}" placeholder="请选择${comment}">
-    #if ("" != $dictType)## 有数据字典
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
-                       :key="dict.value" :label="dict.label" #if ($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end />
-    #else##没数据字典
-            <el-option label="请选择字典生成" value="" />
-    #end
-          </el-select>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox")## 多选框
-        <el-form-item label="${comment}" prop="${javaField}">
-          <el-checkbox-group v-model="form.${javaField}">
-    #if ("" != $dictType)## 有数据字典
-            <el-checkbox v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
-                         :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-checkbox>
-    #else##没数据字典
-            <el-checkbox>请选择字典生成</el-checkbox>
-    #end
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio")## 单选框
-        <el-form-item label="${comment}" prop="${javaField}">
-          <el-radio-group v-model="form.${javaField}">
-    #if ("" != $dictType)## 有数据字典
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
-                      :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-radio>
-    #else##没数据字典
-            <el-radio label="1">请选择字典生成</el-radio>
-    #end
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "datetime")## 时间框
-        <el-form-item label="${comment}" prop="${javaField}">
-          <el-date-picker clearable v-model="form.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
-        </el-form-item>
-#elseif($column.htmlType == "textarea")## 文本框
-        <el-form-item label="${comment}" prop="${javaField}">
-          <el-input v-model="form.${javaField}" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-#end
-#end
-#end
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { create${simpleClassName}, update${simpleClassName}, delete${simpleClassName}, get${simpleClassName}, get${simpleClassName}Page, export${simpleClassName}Excel } from "@/api/${table.moduleName}/${classNameVar}";
+import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}';
+import ${simpleClassName}Form from './${simpleClassName}Form.vue';
 #if ($hasImageUploadColumn)
 import ImageUpload from '@/components/ImageUpload';
 #end
@@ -189,10 +176,22 @@ import FileUpload from '@/components/FileUpload';
 #if ($hasEditorColumn)
 import Editor from '@/components/Editor';
 #end
-
+## 特殊：主子表专属逻辑
+#if ( $subTables && $subTables.size() > 0 )
+    #foreach ($subSimpleClassName in $subSimpleClassNames)
+    import ${subSimpleClassName}List from './components/${subSimpleClassName}List.vue'
+    #end
+#end
 export default {
   name: "${simpleClassName}",
   components: {
+          ${simpleClassName}Form,
+## 特殊：主子表专属逻辑
+#if ( $subTables && $subTables.size() > 0 )
+      #foreach ($subSimpleClassName in $subSimpleClassNames)
+          ${subSimpleClassName}List,
+      #end
+#end
 #if ($hasImageUploadColumn)
     ImageUpload,
 #end
@@ -212,17 +211,25 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 总条数
-      total: 0,
+      ## 特殊：树表专属逻辑（树不需要分页接口）
+      #if ( $table.templateType != 2 )
+        total: 0,
+      #end
       // ${table.classComment}列表
       list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 10,
+        ## 特殊：树表专属逻辑（树不需要分页接口）
+        #if ( $table.templateType != 2 )
+            pageNo: 1,
+            pageSize: 10,
+        #end
         #foreach ($column in $columns)
         #if ($column.listOperation)
         #if ($column.listOperationCondition != 'BETWEEN')
@@ -233,17 +240,6 @@ export default {
         #end
         #end
         #end
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      #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
       }
     };
   },
@@ -253,33 +249,22 @@ export default {
   methods: {
     /** 查询列表 */
     getList() {
+      try {
       this.loading = true;
-      // 执行查询
-      get${simpleClassName}Page(this.queryParams).then(response => {
+      ## 特殊：树表专属逻辑（树不需要分页接口）
+      #if ( $table.templateType == 2 )
+        ${simpleClassName}Api.get${simpleClassName}List(queryParams).then(response => {
+          this.list = this.handleTree(response.data, 'id', '${treeParentColumn.javaField}');
+        })
+      #else
+      ${simpleClassName}Api.get${simpleClassName}Page(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
-        this.loading = false;
       });
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        #foreach ($column in $columns)
-        #if ($column.createOperation || $column.updateOperation)
-        #if ($column.htmlType == "checkbox")
-        $column.javaField: [],
-        #else
-        $column.javaField: undefined,
-        #end
-        #end
-        #end
-      };
-      this.resetForm("form");
+      #end
+      } finally {
+        this.loading = false;
+      }
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -291,79 +276,56 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加${table.classComment}";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const ${primaryColumn.javaField} = row.${primaryColumn.javaField};
-      get${simpleClassName}(${primaryColumn.javaField}).then(response => {
-        this.form = response.data;
-        #foreach ($column in $columns)
-        #if($column.htmlType == "checkbox")## checkbox 特殊处理
-        this.form.$column.javaField = this.form.${column.javaField}.split(",");
-        #end
-        #end
-        this.open = true;
-        this.title = "修改${table.classComment}";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.#[[$]]#refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        #foreach ($column in $columns)
-        #if($column.htmlType == "checkbox")
-        this.form.$column.javaField = this.form.${column.javaField}.join(",");
-        #end
-        #end
-        // 修改的提交
-        if (this.form.${primaryColumn.javaField} != null) {
-          update${simpleClassName}(this.form).then(response => {
-            this.#[[$modal]]#.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        create${simpleClassName}(this.form).then(response => {
-          this.#[[$modal]]#.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.#[[$]]#refs["formRef"].open(id)
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      const that = this;
+      try {
       const ${primaryColumn.javaField} = row.${primaryColumn.javaField};
-      this.#[[$modal]]#.confirm('是否确认删除${table.classComment}编号为"' + ${primaryColumn.javaField} + '"的数据项?').then(function() {
-          return delete${simpleClassName}(${primaryColumn.javaField});
+      this.#[[$modal]]#.confirm('是否确认删除${table.classComment}编号为"' + ${primaryColumn.javaField} + '"的数据项?').then(()=>{
+          return ${simpleClassName}Api.delete${simpleClassName}(${primaryColumn.javaField});
         }).then(() => {
-          this.getList();
-          this.#[[$modal]]#.msgSuccess("删除成功");
+        that.getList();
+        that.#[[$modal]]#.msgSuccess("删除成功");
         }).catch(() => {});
+      } catch {}
     },
     /** 导出按钮操作 */
     handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.#[[$modal]]#.confirm('是否确认导出所有${table.classComment}数据项?').then(() => {
-          this.exportLoading = true;
-          return export${simpleClassName}Excel(params);
-        }).then(response => {
-          this.#[[$]]#download.excel(response, '${table.classComment}.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
+      const that = this;
+      try {
+          this.#[[$modal]]#.confirm('是否确认导出所有${table.classComment}数据项?').then(() => {
+              that.exportLoading = true;
+              return ${simpleClassName}Api.export${simpleClassName}Excel(params);
+            }).then(response => {
+              that.#[[$]]#download.excel(response, '${table.classComment}.xls');
+            }));
+      } catch {
+      } finally {
+        that.exportLoading = false;
+      }
+    },
+      ## 特殊：主子表专属逻辑
+      #if ( $subTables && $subTables.size() > 0 )
+        /** 选中行操作 */
+        handleCurrentChange(row) {
+         this.currentRow = row
+        },
+      #end
+      ## 特殊：树表专属逻辑
+      #if ( $table.templateType == 2 )
+        /** 展开/折叠操作 */
+        toggleExpandAll() {
+          this.refreshTable = false
+          this.isExpandAll = !this.isExpandAll
+          this.$nextTick(function () {
+            this.refreshTable = true
+          })
+        }
+      #end
   }
 };
 </script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
index 5536c39c4..432a968f8 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
@@ -146,9 +146,11 @@ import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.busine
 import { defaultProps, handleTree } from '@/utils/tree'
 #end
 ## 特殊：主子表专属逻辑
+#if ( $subTables && $subTables.size() > 0 )
 #foreach ($subSimpleClassName in $subSimpleClassNames)
 import ${subSimpleClassName}Form from './components/${subSimpleClassName}Form.vue'
 #end
+#end
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index eab90c12a..13c448054 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -113,7 +113,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-## 特殊：主子表专属逻辑
+## 特殊：主子表专属逻辑  TODO puhui999: 普通模式
 #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
     <el-table
       v-loading="loading"
@@ -137,7 +137,7 @@
 #else
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
 #end
-## 特殊：主子表专属逻辑
+## 特殊：主子表专属逻辑  TODO puhui999: 内嵌模式
 #if ( $table.templateType == 12 && $subTables && $subTables.size() > 0 )
       <!-- 子表的列表 -->
       <el-table-column type="expand">
@@ -213,7 +213,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <${simpleClassName}Form ref="formRef" @success="getList" />
-## 特殊：主子表专属逻辑
+## 特殊：主子表专属逻辑 TODO puhui999: ERP 模式
 #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
   <!-- 子表的列表 -->
   <ContentWrap>
@@ -243,7 +243,7 @@ import download from '@/utils/download'
 import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
 import ${simpleClassName}Form from './${simpleClassName}Form.vue'
 ## 特殊：主子表专属逻辑
-#if ( $table.templateType != 10 )
+#if ( $subTables && $subTables.size() > 0 )
 #foreach ($subSimpleClassName in $subSimpleClassNames)
 import ${subSimpleClassName}List from './components/${subSimpleClassName}List.vue'
 #end
@@ -343,9 +343,9 @@ const handleExport = async () => {
     exportLoading.value = false
   }
 }
-## 特殊：主子表专属逻辑
-#if ( $table.templateType == 11 )
 
+## 特殊：主子表专属逻辑
+#if ( $subTables && $subTables.size() > 0 )
 /** 选中行操作 */
 const currentRow = ref({}) // 选中行
 const handleCurrentChange = (row) => {
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index f15b0cf8d..264ad7e10 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -48,7 +48,7 @@ spring:
       primary: master
       datasource:
         master:
-          name: ruoyi-vue-pro
+          name: ruoyi-vue-pro4
           url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例
@@ -62,7 +62,7 @@ spring:
 #          username: SYSDBA # DM 连接的示例
 #          password: SYSDBA # DM 连接的示例
         slave: # 模拟从库，可根据自己需要修改
-          name: ruoyi-vue-pro
+          name: ruoyi-vue-pro4
           lazy: true # 开启懒加载，保证启动速度
           url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
@@ -78,8 +78,8 @@ spring:
   redis:
     host: 127.0.0.1 # 地址
     port: 6379 # 端口
-    database: 0 # 数据库索引
-#    password: dev # 密码，建议生产环境开启
+    database: 4 # 数据库索引
+    password: 123456 # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################
 

From a88c93fc609a3e435a98e492b53b4612a5297f57 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 17 Nov 2023 18:18:27 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E9=87=8D=E6=9E=84=20vue2=20=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=EF=BC=8C=E9=80=82=E9=85=8D=E6=A0=91=E8=A1=A8=E5=92=8C=E4=B8=BB?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=EF=BC=8890%=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue/views/components/form_sub_erp.vue.vm  | 400 ++++++------
 .../views/components/form_sub_inner.vue.vm    |   2 +-
 .../views/components/form_sub_normal.vue.vm   | 570 +++++++-----------
 .../views/components/list_sub_inner.vue.vm    |   2 +-
 4 files changed, 431 insertions(+), 543 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
index c1b4a0a0f..2293189f6 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
@@ -2,203 +2,211 @@
 #set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
 #set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
 <template>
-  <Dialog :title="dialogTitle" :visible.sync="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-#foreach($column in $subColumns)
-    #if ($column.createOperation || $column.updateOperation)
-        #set ($dictType = $column.dictType)
-        #set ($javaField = $column.javaField)
-        #set ($javaType = $column.javaType)
-        #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-        #set ($comment = $column.columnComment)
-        #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
-        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-            #set ($dictMethod = "getIntDictOptions")
-        #elseif ($javaType == "String")
-            #set ($dictMethod = "getStrDictOptions")
-        #elseif ($javaType == "Boolean")
-            #set ($dictMethod = "getBoolDictOptions")
-        #end
-        #if ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里 TODO 芋艿：这里要忽略下 join 字段；
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
-      </el-form-item>
-        #elseif($column.htmlType == "imageUpload")## 图片上传
-      <el-form-item label="${comment}" prop="${javaField}">
-        <UploadImg v-model="formData.${javaField}" />
-      </el-form-item>
-        #elseif($column.htmlType == "fileUpload")## 文件上传
-      <el-form-item label="${comment}" prop="${javaField}">
-        <UploadFile v-model="formData.${javaField}" />
-      </el-form-item>
-        #elseif($column.htmlType == "editor")## 文本编辑器
-      <el-form-item label="${comment}" prop="${javaField}">
-        <Editor v-model="formData.${javaField}" height="150px" />
-      </el-form-item>
-        #elseif($column.htmlType == "select")## 下拉框
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
-                #if ("" != $dictType)## 有数据字典
-          <el-option
-            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-                #else##没数据字典
-          <el-option label="请选择字典生成" value="" />
-                #end
-        </el-select>
-      </el-form-item>
-        #elseif($column.htmlType == "checkbox")## 多选框
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-checkbox-group v-model="formData.${javaField}">
-                #if ("" != $dictType)## 有数据字典
-          <el-checkbox
-            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-checkbox>
-                #else##没数据字典
-          <el-checkbox>请选择字典生成</el-checkbox>
-                #end
-        </el-checkbox-group>
-      </el-form-item>
-        #elseif($column.htmlType == "radio")## 单选框
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-radio-group v-model="formData.${javaField}">
-                #if ("" != $dictType)## 有数据字典
-          <el-radio
-            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-                #else##没数据字典
-          <el-radio label="1">请选择字典生成</el-radio>
-                #end
-        </el-radio-group>
-      </el-form-item>
-        #elseif($column.htmlType == "datetime")## 时间框
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-date-picker
-          v-model="formData.${javaField}"
-          type="date"
-          value-format="x"
-          placeholder="选择${comment}"
-        />
-      </el-form-item>
-        #elseif($column.htmlType == "textarea")## 文本框
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
-      </el-form-item>
-        #end
-    #end
-#end
-    </el-form>
-    <template v-slot:footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="500px" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="80px">
+          #foreach($column in $subColumns)
+              #if ($column.createOperation || $column.updateOperation)
+                  #set ($dictType = $column.dictType)
+                  #set ($javaField = $column.javaField)
+                  #set ($javaType = $column.javaType)
+                  #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                  #set ($comment = $column.columnComment)
+                  #if ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里 TODO 芋艿：这里要忽略下 join 字段；
+                      #if (!$column.primaryKey)## 忽略主键，不用在表单里
+                        <el-form-item label="${comment}" prop="${javaField}">
+                          <el-input v-model="form.${javaField}" placeholder="请输入${comment}" />
+                        </el-form-item>
+                      #end
+                  #elseif($column.htmlType == "imageUpload")## 图片上传
+                      #set ($hasImageUploadColumn = true)
+                    <el-form-item label="${comment}">
+                      <ImageUpload v-model="form.${javaField}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "fileUpload")## 文件上传
+                      #set ($hasFileUploadColumn = true)
+                    <el-form-item label="${comment}">
+                      <FileUpload v-model="form.${javaField}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "editor")## 文本编辑器
+                      #set ($hasEditorColumn = true)
+                    <el-form-item label="${comment}">
+                      <editor v-model="form.${javaField}" :min-height="192"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "select")## 下拉框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-select v-model="form.${javaField}" placeholder="请选择${comment}">
+                          #if ("" != $dictType)## 有数据字典
+                            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                       :key="dict.value" :label="dict.label" #if ($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end />
+                          #else##没数据字典
+                            <el-option label="请选择字典生成" value="" />
+                          #end
+                      </el-select>
+                    </el-form-item>
+                  #elseif($column.htmlType == "checkbox")## 多选框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-checkbox-group v-model="form.${javaField}">
+                          #if ("" != $dictType)## 有数据字典
+                            <el-checkbox v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                         :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-checkbox>
+                          #else##没数据字典
+                            <el-checkbox>请选择字典生成</el-checkbox>
+                          #end
+                      </el-checkbox-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "radio")## 单选框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-radio-group v-model="form.${javaField}">
+                          #if ("" != $dictType)## 有数据字典
+                            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                      :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"
+                                      #else:label="dict.value"#end>{{dict.label}}</el-radio>
+                          #else##没数据字典
+                            <el-radio label="1">请选择字典生成</el-radio>
+                          #end
+                      </el-radio-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "datetime")## 时间框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-date-picker clearable v-model="form.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
+                    </el-form-item>
+                  #elseif($column.htmlType == "textarea")## 文本框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-input v-model="form.${javaField}" type="textarea" placeholder="请输入内容" />
+                    </el-form-item>
+                  #end
+              #end
+          #end
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
-<script setup lang="ts">
-import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
 
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-#foreach ($column in $subColumns)
-    #if ($column.createOperation || $column.updateOperation)
-      #if ($column.htmlType == "checkbox")
-  $column.javaField: [],
-      #else
-  $column.javaField: undefined,
+<script>
+  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+      #if ($hasImageUploadColumn)
+      import ImageUpload from '@/components/ImageUpload';
       #end
-    #end
-#end
-})
-const formRules = reactive({
-#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 formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number, ${subJoinColumn.javaField}: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  formData.value.${subJoinColumn.javaField} = ${subJoinColumn.javaField}
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await ${simpleClassName}Api.get${subSimpleClassName}(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value
-    if (formType.value === 'create') {
-      await ${simpleClassName}Api.create${subSimpleClassName}(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await ${simpleClassName}Api.update${subSimpleClassName}(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-#foreach ($column in $subColumns)
-  #if ($column.createOperation || $column.updateOperation)
-      #if ($column.htmlType == "checkbox")
-    $column.javaField: [],
-      #else
-    $column.javaField: undefined,
+      #if ($hasFileUploadColumn)
+      import FileUpload from '@/components/FileUpload';
       #end
-  #end
-#end
-  }
-  formRef.value?.resetFields()
-}
-</script>
\ No newline at end of file
+      #if ($hasEditorColumn)
+      import Editor from '@/components/Editor';
+      #end
+  export default {
+    name: "${simpleClassName}",
+    components: {
+        #if ($hasImageUploadColumn)
+          ImageUpload,
+        #end
+        #if ($hasFileUploadColumn)
+          FileUpload,
+        #end
+        #if ($hasEditorColumn)
+          Editor,
+        #end
+    },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+            #foreach ($column in $columns)
+                #if ($column.createOperation || $column.updateOperation)
+                    #if ($column.htmlType == "checkbox")
+                            $column.javaField: [],
+                    #else
+                            $column.javaField: undefined,
+                    #end
+                #end
+            #end
+        },
+        // 表单校验
+        formRules: {
+            #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
+        },
+      };
+    },
+    methods: {
+      /** 表单重置 */
+      reset() {
+        this.formData = {
+            #foreach ($column in $columns)
+                #if ($column.createOperation || $column.updateOperation)
+                    #if ($column.htmlType == "checkbox")
+                            $column.javaField: [],
+                    #else
+                            $column.javaField: undefined,
+                    #end
+                #end
+            #end
+        };
+        this.resetForm("formRef");
+      },
+      /** 打开弹窗 */
+      open(id) {
+        this.dialogVisible = true;
+        this.reset();
+        const that = this;
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+              ${simpleClassName}Api.get${subSimpleClassName}(id).then(res=>{
+              that.formData = res.data;
+              that.title = "修改${table.classComment}";
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.title = "新增${table.classComment}";
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.formLoading = true;
+        try {
+          let data = this.formData;
+          this.#[[$]]#refs["formRef"].validate(valid => {
+            if (!valid) {
+              return;
+            }
+            // 修改的提交
+            if (data.${primaryColumn.javaField}) {
+                    ${simpleClassName}Api.update${simpleClassName}(data).then(response => {
+                this.#[[$modal]]#.msgSuccess("修改成功");
+                this.dialogVisible = false;
+                this.#[[$]]#emit('success');
+              });
+              return;
+            }
+            // 添加的提交
+            ${simpleClassName}Api.create${simpleClassName}(data).then(response => {
+              this.#[[$modal]]#.msgSuccess("新增成功");
+              this.dialogVisible = false;
+              this.#[[$]]#emit('success');
+            });
+          });
+        }finally {
+          this.formLoading = false
+        }
+      }
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm
index d8542c3d5..ca266be9d 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm
@@ -1,2 +1,2 @@
 ## 主表的 normal 和 inner 使用相同的 form 表单
-#parse("codegen/vue3/views/components/form_sub_normal.vue.vm")
\ No newline at end of file
+#parse("codegen/vue/views/components/form_sub_normal.vue.vm")
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
index 90df79812..b3f0a332b 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
@@ -4,359 +4,239 @@
 #set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
 #set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
 #set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+
 <template>
+  <div class="app-container">
 #if ( $subTable.subJoinMany )## 情况一：一对多，table + form
-  <el-form
-    ref="formRef"
-    :model="formData"
-    :rules="formRules"
-    v-loading="formLoading"
-    label-width="0px"
-    :inline-message="true"
-  >
-    <el-table :data="formData" class="-mt-10px">
-      <el-table-column label="序号" type="index" width="100" />
-#foreach($column in $subColumns)
-    #if ($column.createOperation || $column.updateOperation)
-        #set ($dictType = $column.dictType)
-        #set ($javaField = $column.javaField)
-        #set ($javaType = $column.javaType)
-        #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-        #set ($comment = $column.columnComment)
-        #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
-        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-            #set ($dictMethod = "getIntDictOptions")
-        #elseif ($javaType == "String")
-            #set ($dictMethod = "getStrDictOptions")
-        #elseif ($javaType == "Boolean")
-            #set ($dictMethod = "getBoolDictOptions")
-        #end
-        #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
-        #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
-      <el-table-column label="${comment}" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
-            <el-input v-model="row.${javaField}" placeholder="请输入${comment}" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-        #elseif($column.htmlType == "imageUpload")## 图片上传
-      <el-table-column label="${comment}" min-width="200">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
-            <UploadImg v-model="row.${javaField}" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-        #elseif($column.htmlType == "fileUpload")## 文件上传
-      <el-table-column label="${comment}" min-width="200">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
-            <UploadFile v-model="row.${javaField}" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-        #elseif($column.htmlType == "editor")## 文本编辑器
-      <el-table-column label="${comment}" min-width="400">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
-            <Editor v-model="row.${javaField}" height="150px" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-        #elseif($column.htmlType == "select")## 下拉框
-      <el-table-column label="${comment}" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
-            <el-select v-model="row.${javaField}" placeholder="请选择${comment}">
-              #if ("" != $dictType)## 有数据字典
-                <el-option
-                  v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              #else##没数据字典
-                <el-option label="请选择字典生成" value="" />
-              #end
-            </el-select>
-          </el-form-item>
-        </template>
-      </el-table-column>
-        #elseif($column.htmlType == "checkbox")## 多选框
-      <el-table-column label="${comment}" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
-            <el-checkbox-group v-model="row.${javaField}">
-              #if ("" != $dictType)## 有数据字典
-                <el-checkbox
-                  v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-                  :key="dict.value"
-                  :label="dict.value"
-                >
-                  {{ dict.label }}
-                </el-checkbox>
-              #else##没数据字典
-                <el-checkbox>请选择字典生成</el-checkbox>
-              #end
-            </el-checkbox-group>
-          </el-form-item>
-        </template>
-      </el-table-column>
-        #elseif($column.htmlType == "radio")## 单选框
-      <el-table-column label="${comment}" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
-            <el-radio-group v-model="row.${javaField}">
-              #if ("" != $dictType)## 有数据字典
-                <el-radio
-                  v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-                  :key="dict.value"
-                  :label="dict.value"
-                >
-                  {{ dict.label }}
-                </el-radio>
-              #else##没数据字典
-                <el-radio label="1">请选择字典生成</el-radio>
-              #end
-            </el-radio-group>
-          </el-form-item>
-        </template>
-      </el-table-column>
-        #elseif($column.htmlType == "datetime")## 时间框
-      <el-table-column label="${comment}" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
-            <el-date-picker
-              v-model="row.${javaField}"
-              type="date"
-              value-format="x"
-              placeholder="选择${comment}"
-            />
-          </el-form-item>
-        </template>
-      </el-table-column>
-        #elseif($column.htmlType == "textarea")## 文本框
-      <el-table-column label="${comment}" min-width="200">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
-            <el-input v-model="row.${javaField}" type="textarea" placeholder="请输入${comment}" />
-          </el-form-item>
-        </template>
-      </el-table-column>
-        #end
-    #end
-#end
-      <el-table-column align="center" fixed="right" label="操作" width="60">
-        <template #default="{ $index }">
-          <el-button @click="handleDelete($index)" link>—</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </el-form>
+      <el-form
+          ref="formRef"
+          :model="formData"
+          :rules="formRules"
+          v-loading="formLoading"
+          label-width="0px"
+          :inline-message="true"
+      >
+##        // TODO puhui999: 看看样式是否需要调整
+        <el-table :data="formData" class="-mt-10px">
+          <el-table-column label="序号" type="index" width="100" />
+            #foreach($column in $subColumns)
+                #if ($column.createOperation || $column.updateOperation)
+                    #set ($dictType = $column.dictType)
+                    #set ($javaField = $column.javaField)
+                    #set ($javaType = $column.javaType)
+                    #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                    #set ($comment = $column.columnComment)
+                    #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+                    #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+                      <el-table-column label="${comment}" min-width="150">
+                        <template slot-scope="{ row, $index }">
+                          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+                            <el-input v-model="row.${javaField}" placeholder="请输入${comment}" />
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                    #elseif($column.htmlType == "imageUpload")## 图片上传
+                        #set ($hasImageUploadColumn = true)
+                      <el-table-column label="${comment}" min-width="200">
+                        <template slot-scope="{ row, $index }">
+                          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+                            <ImageUpload v-model="row.${javaField}"/>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                    #elseif($column.htmlType == "fileUpload")## 文件上传
+                        #set ($hasFileUploadColumn = true)
+                      <el-table-column label="${comment}" min-width="200">
+                        <template slot-scope="{ row, $index }">
+                          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+                            <FileUpload v-model="row.${javaField}"/>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                    #elseif($column.htmlType == "editor")## 文本编辑器
+                        #set ($hasEditorColumn = true)
+                      <el-table-column label="${comment}" min-width="400">
+                        <template slot-scope="{ row, $index }">
+                          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+                            <editor v-model="row.${javaField}" :min-height="192"/>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                    #elseif($column.htmlType == "select")## 下拉框
+                      <el-table-column label="${comment}" min-width="150">
+                        <template slot-scope="{ row, $index }">
+                          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+                            <el-select v-model="row.${javaField}" placeholder="请选择${comment}">
+                                #if ("" != $dictType)## 有数据字典
+                                  <el-option v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                             :key="dict.value" :label="dict.label" #if ($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end />
+                                #else##没数据字典
+                                  <el-option label="请选择字典生成" value="" />
+                                #end
+                            </el-select>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                    #elseif($column.htmlType == "checkbox")## 多选框
+                      <el-table-column label="${comment}" min-width="150">
+                        <template slot-scope="{ row, $index }">
+                          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+                            <el-checkbox-group v-model="row.${javaField}">
+                                #if ("" != $dictType)## 有数据字典
+                                  <el-checkbox v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                               :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-checkbox>
+                                #else##没数据字典
+                                  <el-checkbox>请选择字典生成</el-checkbox>
+                                #end
+                            </el-checkbox-group>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                    #elseif($column.htmlType == "radio")## 单选框
+                      <el-table-column label="${comment}" min-width="150">
+                        <template slot-scope="{ row, $index }">
+                          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+                            <el-radio-group v-model="row.${javaField}">
+                                #if ("" != $dictType)## 有数据字典
+                                  <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                            :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"
+                                            #else:label="dict.value"#end>{{dict.label}}</el-radio>
+                                #else##没数据字典
+                                  <el-radio label="1">请选择字典生成</el-radio>
+                                #end
+                            </el-radio-group>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                    #elseif($column.htmlType == "datetime")## 时间框
+                      <el-table-column label="${comment}" min-width="150">
+                        <template slot-scope="{ row, $index }">
+                          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+                            <el-date-picker
+                                v-model="row.${javaField}"
+                                type="date"
+                                value-format="x"
+                                placeholder="选择${comment}"
+                            />
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                    #elseif($column.htmlType == "textarea")## 文本框
+                      <el-table-column label="${comment}" min-width="200">
+                        <template slot-scope="{ row, $index }">
+                          <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+                            <el-input v-model="row.${javaField}" type="textarea" placeholder="请输入${comment}" />
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                    #end
+                #end
+            #end
+          <el-table-column align="center" fixed="right" label="操作" width="60">
+            <template slot-scope="{ $index }">
+              <el-button @click="handleDelete($index)" link>—</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
   <el-row justify="center" class="mt-3">
     <el-button @click="handleAdd" round>+ 添加${subTable.classComment}</el-button>
   </el-row>
-#else## 情况二：一对一，form
-  <el-form
-    ref="formRef"
-    :model="formData"
-    :rules="formRules"
-    label-width="100px"
-    v-loading="formLoading"
-  >
-#foreach($column in $subColumns)
-  #if ($column.createOperation || $column.updateOperation)
-  #set ($dictType = $column.dictType)
-      #set ($javaField = $column.javaField)
-      #set ($javaType = $column.javaType)
-      #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      #set ($comment = $column.columnComment)
-      #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
-      #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-        #set ($dictMethod = "getIntDictOptions")
-      #elseif ($javaType == "String")
-          #set ($dictMethod = "getStrDictOptions")
-      #elseif ($javaType == "Boolean")
-          #set ($dictMethod = "getBoolDictOptions")
-      #end
-      #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
-      #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
-    <el-form-item label="${comment}" prop="${javaField}">
-      <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
-    </el-form-item>
-      #elseif($column.htmlType == "imageUpload")## 图片上传
-    <el-form-item label="${comment}" prop="${javaField}">
-      <UploadImg v-model="formData.${javaField}" />
-    </el-form-item>
-      #elseif($column.htmlType == "fileUpload")## 文件上传
-    <el-form-item label="${comment}" prop="${javaField}">
-      <UploadFile v-model="formData.${javaField}" />
-    </el-form-item>
-      #elseif($column.htmlType == "editor")## 文本编辑器
-    <el-form-item label="${comment}" prop="${javaField}">
-      <Editor v-model="formData.${javaField}" height="150px" />
-    </el-form-item>
-      #elseif($column.htmlType == "select")## 下拉框
-    <el-form-item label="${comment}" prop="${javaField}">
-      <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
-              #if ("" != $dictType)## 有数据字典
-        <el-option
-          v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
-              #else##没数据字典
-        <el-option label="请选择字典生成" value="" />
-              #end
-      </el-select>
-    </el-form-item>
-      #elseif($column.htmlType == "checkbox")## 多选框
-    <el-form-item label="${comment}" prop="${javaField}">
-      <el-checkbox-group v-model="formData.${javaField}">
-              #if ("" != $dictType)## 有数据字典
-        <el-checkbox
-          v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-          :key="dict.value"
-          :label="dict.value"
-        >
-          {{ dict.label }}
-        </el-checkbox>
-              #else##没数据字典
-        <el-checkbox>请选择字典生成</el-checkbox>
-              #end
-      </el-checkbox-group>
-    </el-form-item>
-      #elseif($column.htmlType == "radio")## 单选框
-    <el-form-item label="${comment}" prop="${javaField}">
-      <el-radio-group v-model="formData.${javaField}">
-              #if ("" != $dictType)## 有数据字典
-        <el-radio
-          v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-          :key="dict.value"
-          :label="dict.value"
-          >
-          {{ dict.label }}
-        </el-radio>
-              #else##没数据字典
-        <el-radio label="1">请选择字典生成</el-radio>
-              #end
-      </el-radio-group>
-    </el-form-item>
-      #elseif($column.htmlType == "datetime")## 时间框
-    <el-form-item label="${comment}" prop="${javaField}">
-      <el-date-picker
-        v-model="formData.${javaField}"
-        type="date"
-        value-format="x"
-        placeholder="选择${comment}"
-      />
-    </el-form-item>
-      #elseif($column.htmlType == "textarea")## 文本框
-    <el-form-item label="${comment}" prop="${javaField}">
-      <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
-    </el-form-item>
-      #end
-  #end
-#end
-  </el-form>
 #end
+  </div>
 </template>
-<script setup lang="ts">
-import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
 
-const props = defineProps<{
-  ${subJoinColumn.javaField}: undefined // ${subJoinColumn.columnComment}（主表的关联字段）
-}>()
-const formLoading = ref(false) // 表单的加载中
-const formData = ref([])
-const formRules = reactive({
-#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 formRef = ref() // 表单 Ref
-
-/** 监听主表的关联字段的变化，加载对应的子表数据 */
-watch(
-  () => props.${subJoinColumn.javaField},
-  async (val) => {
-    // 1. 重置表单
-#if ( $subTable.subJoinMany )
-    formData.value = []
-#else
-    formData.value = {
-    #foreach ($column in $subColumns)
-      #if ($column.createOperation || $column.updateOperation)
-        #if ($column.htmlType == "checkbox")
-      $column.javaField: [],
-        #else
-      $column.javaField: undefined,
+<script>
+  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+      #if ($hasImageUploadColumn)
+      import ImageUpload from '@/components/ImageUpload';
+      #end
+      #if ($hasFileUploadColumn)
+      import FileUpload from '@/components/FileUpload';
+      #end
+      #if ($hasEditorColumn)
+      import Editor from '@/components/Editor';
+      #end
+  export default {
+    name: "${simpleClassName}",
+    components: {
+        #if ($hasImageUploadColumn)
+          ImageUpload,
         #end
-      #end
-    #end
-    }
-#end
-    // 2. val 非空，则加载数据
-    if (!val) {
-      return;
-    }
-    try {
-      formLoading.value = true
-#if ( $subTable.subJoinMany )
-      formData.value = await ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(val)
-#else
-      const data = await ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(val)
-      if (!data) {
-        return
+        #if ($hasFileUploadColumn)
+          FileUpload,
+        #end
+        #if ($hasEditorColumn)
+          Editor,
+        #end
+    },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+            #foreach ($column in $columns)
+                #if ($column.createOperation || $column.updateOperation)
+                    #if ($column.htmlType == "checkbox")
+                            $column.javaField: [],
+                    #else
+                            $column.javaField: undefined,
+                    #end
+                #end
+            #end
+        },
+        // 表单校验
+        formRules: {
+            #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
+        },
+      };
+    },
+    props:{
+      ${subJoinColumn.javaField}: undefined // ${subJoinColumn.columnComment}（主表的关联字段）
+    },
+    methods: {
+        #if ( $subTable.subJoinMany )
+
+          /** 新增按钮操作 */
+        handleAdd(){
+            const row = {
+                #foreach ($column in $subColumns)
+                    #if ($column.createOperation || $column.updateOperation)
+                        #if ($column.htmlType == "checkbox")
+                                $column.javaField: [],
+                        #else
+                                $column.javaField: undefined,
+                        #end
+                    #end
+                #end
+            }
+            row.${subJoinColumn.javaField} = this.${subJoinColumn.javaField}
+            this.formData.push(row)
+          },
+
+          /** 删除按钮操作 */
+        handleDelete(index) {
+            this.formData.splice(index, 1)
+          },
+        #end
+      /** 表单值 */
+      getData() {
+        return this.formData
+      },
+      /** 表单校验 */
+      validate() {
+
       }
-      formData.value = data
-#end
-    } finally {
-      formLoading.value = false
     }
-  },
-  { immediate: true }
-)
-#if ( $subTable.subJoinMany )
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  const row = {
-#foreach ($column in $subColumns)
-    #if ($column.createOperation || $column.updateOperation)
-      #if ($column.htmlType == "checkbox")
-    $column.javaField: [],
-      #else
-    $column.javaField: undefined,
-      #end
-  #end
-#end
-  }
-  row.${subJoinColumn.javaField} = props.${subJoinColumn.javaField}
-  formData.value.push(row)
-}
-
-/** 删除按钮操作 */
-const handleDelete = (index) => {
-  formData.value.splice(index, 1)
-}
-#end
-
-/** 表单校验 */
-const validate = () => {
-  return formRef.value.validate()
-}
-
-/** 表单值 */
-const getData = () => {
-  return formData.value
-}
-
-defineExpose({ validate, getData })
-</script>
\ No newline at end of file
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm
index 3fe648892..90b8e4153 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm
@@ -1,4 +1,4 @@
 ## 子表的 erp 和 inner 使用相似的 list 列表，差异主要两点：
 ## 1）inner 使用 list 不分页，erp 使用 page 分页
 ## 2）erp 支持单个子表的新增、修改、删除，inner 不支持
-#parse("codegen/vue3/views/components/list_sub_erp.vue.vm")
\ No newline at end of file
+#parse("codegen/vue/views/components/list_sub_erp.vue.vm")
\ No newline at end of file

From 80db28ee5bccf8612394e48b9f9d6e9c58d42da7 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 21 Nov 2023 10:49:43 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E9=87=8D=E6=9E=84=20vue2=20=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=EF=BC=8C=E9=80=82=E9=85=8D=E6=A0=91=E8=A1=A8=E5=92=8C=E4=B8=BB?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/codegen/inner/CodegenEngine.java  |  14 +-
 .../vue/views/components/form_sub_erp.vue.vm  |  86 +--
 .../views/components/form_sub_normal.vue.vm   | 214 ++++--
 .../vue/views/components/list_sub_erp.vue.vm  | 319 ++++-----
 .../resources/codegen/vue/views/form.vue.vm   | 294 ++++----
 .../resources/codegen/vue/views/index.vue.vm  |  25 +-
 .../resources/codegen/vue3/views/form.vue.vm  | 540 +++++++--------
 .../resources/codegen/vue3/views/index.vue.vm | 647 +++++++++---------
 .../codegen/inner/CodegenEngineVue2Test.java  | 202 ++++++
 9 files changed, 1342 insertions(+), 999 deletions(-)
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
index 4ce4c2f98..933b27a46 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
@@ -104,6 +104,18 @@ public class CodegenEngine {
                     vueFilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
             .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("api/api.js"),
                     vueFilePath("api/${table.moduleName}/${classNameVar}.js"))
+            .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/form.vue"),
+                    vueFilePath("views/${table.moduleName}/${table.businessName}/${simpleClassName}Form.vue"))
+            .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/form_sub_normal.vue"),  // 特殊：主子表专属逻辑
+                    vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
+            .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/form_sub_inner.vue"),  // 特殊：主子表专属逻辑
+                    vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
+            .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/form_sub_erp.vue"),  // 特殊：主子表专属逻辑
+                    vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
+            .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/list_sub_inner.vue"),  // 特殊：主子表专属逻辑
+                    vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}List.vue"))
+            .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/list_sub_erp.vue"),  // 特殊：主子表专属逻辑
+                    vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}List.vue"))
             // Vue3 标准模版
             .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/index.vue"),
                     vue3FilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
@@ -452,7 +464,7 @@ public class CodegenEngine {
     }
 
     private static String vueFilePath(String path) {
-        return "yudao-ui-${sceneEnum.basePackage}/" + // 顶级目录
+        return "yudao-ui-${sceneEnum.basePackage}-vue2/" + // 顶级目录
                 "src/" + path;
     }
 
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
index 2293189f6..eb7c45b3b 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
@@ -4,8 +4,8 @@
 <template>
   <div class="app-container">
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="80px">
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
           #foreach($column in $subColumns)
               #if ($column.createOperation || $column.updateOperation)
                   #set ($dictType = $column.dictType)
@@ -13,30 +13,29 @@
                   #set ($javaType = $column.javaType)
                   #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
                   #set ($comment = $column.columnComment)
-                  #if ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里 TODO 芋艿：这里要忽略下 join 字段；
-                      #if (!$column.primaryKey)## 忽略主键，不用在表单里
-                        <el-form-item label="${comment}" prop="${javaField}">
-                          <el-input v-model="form.${javaField}" placeholder="请输入${comment}" />
-                        </el-form-item>
-                      #end
+                  #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+                  #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
+                    </el-form-item>
                   #elseif($column.htmlType == "imageUpload")## 图片上传
                       #set ($hasImageUploadColumn = true)
-                    <el-form-item label="${comment}">
-                      <ImageUpload v-model="form.${javaField}"/>
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <ImageUpload v-model="formData.${javaField}"/>
                     </el-form-item>
                   #elseif($column.htmlType == "fileUpload")## 文件上传
                       #set ($hasFileUploadColumn = true)
-                    <el-form-item label="${comment}">
-                      <FileUpload v-model="form.${javaField}"/>
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <FileUpload v-model="formData.${javaField}"/>
                     </el-form-item>
                   #elseif($column.htmlType == "editor")## 文本编辑器
                       #set ($hasEditorColumn = true)
-                    <el-form-item label="${comment}">
-                      <editor v-model="form.${javaField}" :min-height="192"/>
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <editor v-model="formData.${javaField}" :min-height="192"/>
                     </el-form-item>
                   #elseif($column.htmlType == "select")## 下拉框
                     <el-form-item label="${comment}" prop="${javaField}">
-                      <el-select v-model="form.${javaField}" placeholder="请选择${comment}">
+                      <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
                           #if ("" != $dictType)## 有数据字典
                             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
                                        :key="dict.value" :label="dict.label" #if ($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end />
@@ -47,7 +46,7 @@
                     </el-form-item>
                   #elseif($column.htmlType == "checkbox")## 多选框
                     <el-form-item label="${comment}" prop="${javaField}">
-                      <el-checkbox-group v-model="form.${javaField}">
+                      <el-checkbox-group v-model="formData.${javaField}">
                           #if ("" != $dictType)## 有数据字典
                             <el-checkbox v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
                                          :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-checkbox>
@@ -58,7 +57,7 @@
                     </el-form-item>
                   #elseif($column.htmlType == "radio")## 单选框
                     <el-form-item label="${comment}" prop="${javaField}">
-                      <el-radio-group v-model="form.${javaField}">
+                      <el-radio-group v-model="formData.${javaField}">
                           #if ("" != $dictType)## 有数据字典
                             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
                                       :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"
@@ -70,11 +69,11 @@
                     </el-form-item>
                   #elseif($column.htmlType == "datetime")## 时间框
                     <el-form-item label="${comment}" prop="${javaField}">
-                      <el-date-picker clearable v-model="form.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
+                      <el-date-picker clearable v-model="formData.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
                     </el-form-item>
                   #elseif($column.htmlType == "textarea")## 文本框
                     <el-form-item label="${comment}" prop="${javaField}">
-                      <el-input v-model="form.${javaField}" type="textarea" placeholder="请输入内容" />
+                      <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入内容" />
                     </el-form-item>
                   #end
               #end
@@ -100,7 +99,7 @@
       import Editor from '@/components/Editor';
       #end
   export default {
-    name: "${simpleClassName}",
+    name: "${subSimpleClassName}Form",
     components: {
         #if ($hasImageUploadColumn)
           ImageUpload,
@@ -122,7 +121,7 @@
         formLoading: false,
         // 表单参数
         formData: {
-            #foreach ($column in $columns)
+            #foreach ($column in $subColumns)
                 #if ($column.createOperation || $column.updateOperation)
                     #if ($column.htmlType == "checkbox")
                             $column.javaField: [],
@@ -134,7 +133,7 @@
         },
         // 表单校验
         formRules: {
-            #foreach ($column in $columns)
+            #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 }],
@@ -144,39 +143,25 @@
       };
     },
     methods: {
-      /** 表单重置 */
-      reset() {
-        this.formData = {
-            #foreach ($column in $columns)
-                #if ($column.createOperation || $column.updateOperation)
-                    #if ($column.htmlType == "checkbox")
-                            $column.javaField: [],
-                    #else
-                            $column.javaField: undefined,
-                    #end
-                #end
-            #end
-        };
-        this.resetForm("formRef");
-      },
       /** 打开弹窗 */
-      open(id) {
+      open(id, ${subJoinColumn.javaField}) {
         this.dialogVisible = true;
         this.reset();
         const that = this;
+        this.formData.${subJoinColumn.javaField} = ${subJoinColumn.javaField};
         // 修改时，设置数据
         if (id) {
           this.formLoading = true;
           try {
               ${simpleClassName}Api.get${subSimpleClassName}(id).then(res=>{
               that.formData = res.data;
-              that.title = "修改${table.classComment}";
+              that.dialogTitle = "修改${table.classComment}";
             })
           } finally {
             this.formLoading = false;
           }
         }
-        this.title = "新增${table.classComment}";
+        this.dialogTitle = "新增${table.classComment}";
       },
       /** 提交按钮 */
       submitForm() {
@@ -189,7 +174,7 @@
             }
             // 修改的提交
             if (data.${primaryColumn.javaField}) {
-                    ${simpleClassName}Api.update${simpleClassName}(data).then(response => {
+              ${simpleClassName}Api.update${subSimpleClassName}(data).then(response => {
                 this.#[[$modal]]#.msgSuccess("修改成功");
                 this.dialogVisible = false;
                 this.#[[$]]#emit('success');
@@ -197,7 +182,7 @@
               return;
             }
             // 添加的提交
-            ${simpleClassName}Api.create${simpleClassName}(data).then(response => {
+            ${simpleClassName}Api.create${subSimpleClassName}(data).then(response => {
               this.#[[$modal]]#.msgSuccess("新增成功");
               this.dialogVisible = false;
               this.#[[$]]#emit('success');
@@ -206,7 +191,22 @@
         }finally {
           this.formLoading = false
         }
-      }
+      },
+      /** 表单重置 */
+      reset() {
+        this.formData = {
+            #foreach ($column in $subColumns)
+                #if ($column.createOperation || $column.updateOperation)
+                    #if ($column.htmlType == "checkbox")
+                            $column.javaField: [],
+                    #else
+                            $column.javaField: undefined,
+                    #end
+                #end
+            #end
+        };
+        this.resetForm("formRef");
+      },
     }
   };
 </script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
index b3f0a332b..ae6cf7b63 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
@@ -4,10 +4,8 @@
 #set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
 #set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
 #set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
-
 <template>
-  <div class="app-container">
-#if ( $subTable.subJoinMany )## 情况一：一对多，table + form
+    #if ( $subTable.subJoinMany )## 情况一：一对多，table + form
       <el-form
           ref="formRef"
           :model="formData"
@@ -16,7 +14,6 @@
           label-width="0px"
           :inline-message="true"
       >
-##        // TODO puhui999: 看看样式是否需要调整
         <el-table :data="formData" class="-mt-10px">
           <el-table-column label="序号" type="index" width="100" />
             #foreach($column in $subColumns)
@@ -29,7 +26,7 @@
                     #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
                     #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
                       <el-table-column label="${comment}" min-width="150">
-                        <template slot-scope="{ row, $index }">
+                        <template v-slot="{ row, $index }">
                           <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
                             <el-input v-model="row.${javaField}" placeholder="请输入${comment}" />
                           </el-form-item>
@@ -38,7 +35,7 @@
                     #elseif($column.htmlType == "imageUpload")## 图片上传
                         #set ($hasImageUploadColumn = true)
                       <el-table-column label="${comment}" min-width="200">
-                        <template slot-scope="{ row, $index }">
+                        <template v-slot="{ row, $index }">
                           <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
                             <ImageUpload v-model="row.${javaField}"/>
                           </el-form-item>
@@ -47,7 +44,7 @@
                     #elseif($column.htmlType == "fileUpload")## 文件上传
                         #set ($hasFileUploadColumn = true)
                       <el-table-column label="${comment}" min-width="200">
-                        <template slot-scope="{ row, $index }">
+                        <template v-slot="{ row, $index }">
                           <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
                             <FileUpload v-model="row.${javaField}"/>
                           </el-form-item>
@@ -56,15 +53,15 @@
                     #elseif($column.htmlType == "editor")## 文本编辑器
                         #set ($hasEditorColumn = true)
                       <el-table-column label="${comment}" min-width="400">
-                        <template slot-scope="{ row, $index }">
+                        <template v-slot="{ row, $index }">
                           <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
-                            <editor v-model="row.${javaField}" :min-height="192"/>
+                            <Editor v-model="row.${javaField}" :min-height="192"/>
                           </el-form-item>
                         </template>
                       </el-table-column>
                     #elseif($column.htmlType == "select")## 下拉框
                       <el-table-column label="${comment}" min-width="150">
-                        <template slot-scope="{ row, $index }">
+                        <template v-slot="{ row, $index }">
                           <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
                             <el-select v-model="row.${javaField}" placeholder="请选择${comment}">
                                 #if ("" != $dictType)## 有数据字典
@@ -79,7 +76,7 @@
                       </el-table-column>
                     #elseif($column.htmlType == "checkbox")## 多选框
                       <el-table-column label="${comment}" min-width="150">
-                        <template slot-scope="{ row, $index }">
+                        <template v-slot="{ row, $index }">
                           <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
                             <el-checkbox-group v-model="row.${javaField}">
                                 #if ("" != $dictType)## 有数据字典
@@ -94,7 +91,7 @@
                       </el-table-column>
                     #elseif($column.htmlType == "radio")## 单选框
                       <el-table-column label="${comment}" min-width="150">
-                        <template slot-scope="{ row, $index }">
+                        <template v-slot="{ row, $index }">
                           <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
                             <el-radio-group v-model="row.${javaField}">
                                 #if ("" != $dictType)## 有数据字典
@@ -110,20 +107,15 @@
                       </el-table-column>
                     #elseif($column.htmlType == "datetime")## 时间框
                       <el-table-column label="${comment}" min-width="150">
-                        <template slot-scope="{ row, $index }">
+                        <template v-slot="{ row, $index }">
                           <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
-                            <el-date-picker
-                                v-model="row.${javaField}"
-                                type="date"
-                                value-format="x"
-                                placeholder="选择${comment}"
-                            />
+                            <el-date-picker clearable v-model="row.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
                           </el-form-item>
                         </template>
                       </el-table-column>
                     #elseif($column.htmlType == "textarea")## 文本框
                       <el-table-column label="${comment}" min-width="200">
-                        <template slot-scope="{ row, $index }">
+                        <template v-slot="{ row, $index }">
                           <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
                             <el-input v-model="row.${javaField}" type="textarea" placeholder="请输入${comment}" />
                           </el-form-item>
@@ -133,17 +125,97 @@
                 #end
             #end
           <el-table-column align="center" fixed="right" label="操作" width="60">
-            <template slot-scope="{ $index }">
-              <el-button @click="handleDelete($index)" link>—</el-button>
+            <template v-slot="{ $index }">
+              <el-link @click="handleDelete($index)">—</el-link>
             </template>
           </el-table-column>
         </el-table>
       </el-form>
-  <el-row justify="center" class="mt-3">
-    <el-button @click="handleAdd" round>+ 添加${subTable.classComment}</el-button>
-  </el-row>
-#end
-  </div>
+      <el-row justify="center" class="mt-3">
+        <el-button @click="handleAdd" round>+ 添加${subTable.classComment}</el-button>
+      </el-row>
+    #else## 情况二：一对一，form
+      <el-form
+          ref="formRef"
+          :model="formData"
+          :rules="formRules"
+          label-width="100px"
+          v-loading="formLoading"
+      >
+          #foreach($column in $subColumns)
+              #if ($column.createOperation || $column.updateOperation)
+                  #set ($dictType = $column.dictType)
+                  #set ($javaField = $column.javaField)
+                  #set ($javaType = $column.javaType)
+                  #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                  #set ($comment = $column.columnComment)
+                  #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+                  #elseif ($column.htmlType == "input" && !$column.primaryKey)
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
+                    </el-form-item>
+                  #elseif($column.htmlType == "imageUpload")## 图片上传
+                      #set ($hasImageUploadColumn = true)
+                    <el-form-item label="${comment}">
+                      <ImageUpload v-model="formData.${javaField}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "fileUpload")## 文件上传
+                      #set ($hasFileUploadColumn = true)
+                    <el-form-item label="${comment}">
+                      <FileUpload v-model="formData.${javaField}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "editor")## 文本编辑器
+                      #set ($hasEditorColumn = true)
+                    <el-form-item label="${comment}">
+                      <Editor v-model="formData.${javaField}" :min-height="192"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "select")## 下拉框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
+                          #if ("" != $dictType)## 有数据字典
+                            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                       :key="dict.value" :label="dict.label" #if ($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end />
+                          #else##没数据字典
+                            <el-option label="请选择字典生成" value="" />
+                          #end
+                      </el-select>
+                    </el-form-item>
+                  #elseif($column.htmlType == "checkbox")## 多选框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-checkbox-group v-model="formData.${javaField}">
+                          #if ("" != $dictType)## 有数据字典
+                            <el-checkbox v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                         :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-checkbox>
+                          #else##没数据字典
+                            <el-checkbox>请选择字典生成</el-checkbox>
+                          #end
+                      </el-checkbox-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "radio")## 单选框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-radio-group v-model="formData.${javaField}">
+                          #if ("" != $dictType)## 有数据字典
+                            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                      :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"
+                                      #else:label="dict.value"#end>{{dict.label}}</el-radio>
+                          #else##没数据字典
+                            <el-radio label="1">请选择字典生成</el-radio>
+                          #end
+                      </el-radio-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "datetime")## 时间框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-date-picker clearable v-model="formData.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
+                    </el-form-item>
+                  #elseif($column.htmlType == "textarea")## 文本框
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
+                    </el-form-item>
+                  #end
+              #end
+          #end
+      </el-form>
+    #end
 </template>
 
 <script>
@@ -158,7 +230,7 @@
       import Editor from '@/components/Editor';
       #end
   export default {
-    name: "${simpleClassName}",
+    name: "${subSimpleClassName}Form",
     components: {
         #if ($hasImageUploadColumn)
           ImageUpload,
@@ -170,29 +242,18 @@
           Editor,
         #end
     },
+    props:[
+      '${subJoinColumn.javaField}'
+    ],// ${subJoinColumn.columnComment}（主表的关联字段）
     data() {
       return {
-        // 弹出层标题
-        dialogTitle: "",
-        // 是否显示弹出层
-        dialogVisible: false,
         // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
         formLoading: false,
         // 表单参数
-        formData: {
-            #foreach ($column in $columns)
-                #if ($column.createOperation || $column.updateOperation)
-                    #if ($column.htmlType == "checkbox")
-                            $column.javaField: [],
-                    #else
-                            $column.javaField: undefined,
-                    #end
-                #end
-            #end
-        },
+        formData: [],
         // 表单校验
         formRules: {
-            #foreach ($column in $columns)
+            #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 }],
@@ -201,14 +262,56 @@
         },
       };
     },
-    props:{
-      ${subJoinColumn.javaField}: undefined // ${subJoinColumn.columnComment}（主表的关联字段）
+    watch:{/** 监听主表的关联字段的变化，加载对应的子表数据 */
+      ${subJoinColumn.javaField}:{
+        handler(val) {
+          // 1. 重置表单
+            #if ( $subTable.subJoinMany )
+              this.formData = []
+            #else
+              this.formData = {
+                  #foreach ($column in $subColumns)
+                      #if ($column.createOperation || $column.updateOperation)
+                          #if ($column.htmlType == "checkbox")
+                                  $column.javaField: [],
+                          #else
+                                  $column.javaField: undefined,
+                          #end
+                      #end
+                  #end
+              }
+            #end
+          // 2. val 非空，则加载数据
+          if (!val) {
+            return;
+          }
+          try {
+            this.formLoading = true;
+            const that = this;
+            #if ( $subTable.subJoinMany )
+            ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(val).then(res=>{
+              that.formData = res.data;
+            })
+            #else
+            ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(val).then(res=>{
+              const data = res.data;
+              if (!data) {
+                return
+              }
+              that.formData = data;
+            })
+            #end
+          } finally {
+            this.formLoading = false;
+          }
+        },
+        immediate: true
+      }
     },
     methods: {
         #if ( $subTable.subJoinMany )
-
           /** 新增按钮操作 */
-        handleAdd(){
+          handleAdd() {
             const row = {
                 #foreach ($column in $subColumns)
                     #if ($column.createOperation || $column.updateOperation)
@@ -223,19 +326,18 @@
             row.${subJoinColumn.javaField} = this.${subJoinColumn.javaField}
             this.formData.push(row)
           },
-
           /** 删除按钮操作 */
-        handleDelete(index) {
+          handleDelete(index) {
             this.formData.splice(index, 1)
           },
         #end
-      /** 表单值 */
-      getData() {
-        return this.formData
-      },
       /** 表单校验 */
-      validate() {
-
+      validate(){
+        return this.#[[$]]#refs["formRef"].validate()
+      },
+      /** 表单值 */
+      getData(){
+        return this.formData
       }
     }
   };
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
index 5ad208b3b..7f7f29974 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
@@ -1,181 +1,164 @@
-#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 ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
 <template>
-  <!-- 列表 -->
-  <ContentWrap>
+  <div class="app-container">
 #if ($table.templateType == 11)
-    <el-button
-      type="primary"
-      plain
-      @click="openForm('create')"
-      v-hasPermi="['${permissionPrefix}:create']"
-    >
-      <Icon icon="ep:plus" class="mr-5px" /> 新增
-    </el-button>
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['${permissionPrefix}:create']">新增</el-button>
+      </el-col>
+    </el-row>
 #end
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      #foreach($column in $subColumns)
-      #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.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
-        #elseif ($column.javaType == "LocalDateTime")## 时间类型
-      <el-table-column
-        label="${comment}"
-        align="center"
-        prop="${javaField}"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-        #elseif($column.dictType && "" != $column.dictType)## 数据字典
-      <el-table-column label="${comment}" align="center" prop="${javaField}">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.${column.javaField}" />
-        </template>
-      </el-table-column>
-        #else
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
-        #end
+      ## 列表
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+          #foreach($column in $subColumns)
+              #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.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+                  #elseif ($column.javaType == "LocalDateTime")## 时间类型
+                <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+                  <template v-slot="scope">
+                    <span>{{ parseTime(scope.row.${javaField}) }}</span>
+                  </template>
+                </el-table-column>
+                  #elseif($column.dictType && "" != $column.dictType)## 数据字典
+                <el-table-column label="${comment}" align="center" prop="${javaField}">
+                  <template v-slot="scope">
+                    <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.${column.javaField}" />
+                  </template>
+                </el-table-column>
+              #else
+                <el-table-column label="${comment}" align="center" prop="${javaField}" />
+              #end
+          #end
       #end
-    #end
-    #if ($table.templateType == 11)
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['${permissionPrefix}:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['${permissionPrefix}:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    #end
-    </el-table>
-    #if ($table.templateType == 11)
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-    #end
-  </ContentWrap>
+    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <template v-slot="scope">
+        <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.${primaryColumn.javaField})"
+                   v-hasPermi="['${permissionPrefix}:update']">修改</el-button>
+        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                   v-hasPermi="['${permissionPrefix}:delete']">删除</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
 #if ($table.templateType == 11)
-    <!-- 表单弹窗：添加/修改 -->
-    <${subSimpleClassName}Form ref="formRef" @success="getList" />
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+  <!-- 对话框(添加 / 修改) -->
+  <${subSimpleClassName}Form ref="formRef" @success="getList" />
 #end
+  </div>
 </template>
-<script setup lang="ts">
-import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
-import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
-#if ($table.templateType == 11)
-import ${subSimpleClassName}Form from './${subSimpleClassName}Form.vue'
-#end
 
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const props = defineProps<{
-  ${subJoinColumn.javaField}: undefined // ${subJoinColumn.columnComment}（主表的关联字段）
-}>()
-const loading = ref(false) // 列表的加载中
-const list = ref([]) // 列表的数据
-#if ($table.templateType == 11)
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  ${subJoinColumn.javaField}: undefined
-})
-
-/** 监听主表的关联字段的变化，加载对应的子表数据 */
-watch(
-  () => props.${subJoinColumn.javaField},
-  (val) => {
-    queryParams.${subJoinColumn.javaField} = val
-    handleQuery()
-  },
-  { immediate: false }
-)
-#end
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-#if ($table.templateType == 11)
-    const data = await ${simpleClassName}Api.get${subSimpleClassName}Page(queryParams)
-    list.value = data.list
-    total.value = data.total
-#else
-  #if ( $subTable.subJoinMany )
-    list.value = await ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(props.${subJoinColumn.javaField})
-  #else
-    const data = await ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(props.${subJoinColumn.javaField})
-    if (!data) {
-      return
-    }
-    list.value.push(data)
+<script>
+  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+  #if ($table.templateType == 11)
+  import ${subSimpleClassName}Form from './${subSimpleClassName}Form.vue'
   #end
-#end
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
+  export default {
+    name: "${subSimpleClassName}List",
 #if ($table.templateType == 11)
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  if (!props.${subJoinColumn.javaField}) {
-    message.error('请选择一个${table.classComment}')
-    return
-  }
-  formRef.value.open(type, id, props.${subJoinColumn.javaField})
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ${simpleClassName}Api.delete${subSimpleClassName}(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
+    components: {
+       ${subSimpleClassName}Form
+    },
 #end
+    props:[
+      '${subJoinColumn.javaField}'
+    ],// ${subJoinColumn.columnComment}（主表的关联字段）
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 列表的数据
+        list: [],
+#if ($table.templateType == 11)
+        // 列表的总页数
+        total: 0,
+        // 查询参数
+        queryParams: {
+          pageNo: 1,
+          pageSize: 10,
+          ${subJoinColumn.javaField}: undefined
+        }
+#end
+      };
+    },
 #if ($table.templateType != 11)
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
+    created() {
+      this.getList();
+    },
 #end
-</script>
\ No newline at end of file
+    watch:{/** 监听主表的关联字段的变化，加载对应的子表数据 */
+        ${subJoinColumn.javaField}:{
+            handler(val) {
+              this.queryParams.${subJoinColumn.javaField} = val
+              this.handleQuery()
+            },
+            immediate: true
+      }
+    },
+    methods: {
+      /** 查询列表 */
+      getList() {
+        try {
+          this.loading = true;
+          const that = this;
+          #if ($table.templateType == 11)
+          ${simpleClassName}Api.get${subSimpleClassName}Page(this.queryParams).then(response => {
+            that.list = response.data.list;
+            that.total = response.data.total;
+          });
+          #else
+              #if ( $subTable.subJoinMany )
+                ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(this.${subJoinColumn.javaField}).then(response=>{
+                  that.list = response.data;
+              })
+              #else
+                ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(this.${subJoinColumn.javaField}).then(response=>{
+                  const data = response.data;
+                  if (!data) {
+                    return
+                  }
+                  that.list.push(data)
+              })
+              #end
+          #end
+        } finally {
+          this.loading = false;
+        }
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNo = 1;
+        this.getList();
+      },
+#if ($table.templateType == 11)
+      /** 添加/修改操作 */
+      openForm(id) {
+        if (!this.${subJoinColumn.javaField}) {
+          that.#[[$modal]]#.msgError('请选择一个${table.classComment}');
+          return;
+        }
+        this.#[[$]]#refs["formRef"].open(id, this.${subJoinColumn.javaField});
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const that = this;
+        try {
+          const ${primaryColumn.javaField} = row.${primaryColumn.javaField};
+          this.#[[$modal]]#.confirm('是否确认删除${table.classComment}编号为"' + ${primaryColumn.javaField} + '"的数据项?').then(()=>{
+            return ${simpleClassName}Api.delete${subSimpleClassName}(${primaryColumn.javaField});
+          }).then(() => {
+            that.getList();
+            that.#[[$modal]]#.msgSuccess("删除成功");
+          }).catch(() => {});
+        } catch {}
+      },
+    }
+#end
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
index 7be0ed089..0e61203d6 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="80px">
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
           #foreach($column in $columns)
               #if ($column.createOperation || $column.updateOperation)
                   #set ($dictType = $column.dictType)
@@ -11,37 +11,35 @@
                   #set ($comment = $column.columnComment)
                   #if ( $table.templateType == 2 && $column.id == $treeParentColumn.id )
                     <el-form-item label="${comment}" prop="${javaField}">
-                      <treeselect
+                      <TreeSelect
                           v-model="formData.${javaField}"
                           :options="${classNameVar}Tree"
                           :normalizer="normalizer"
                           placeholder="请选择${comment}"
                       />
                     </el-form-item>
-                  #elseif ($column.htmlType == "input" && !$column.primaryKey)
-                      #if (!$column.primaryKey)## 忽略主键，不用在表单里
-                        <el-form-item label="${comment}" prop="${javaField}">
-                          <el-input v-model="form.${javaField}" placeholder="请输入${comment}" />
-                        </el-form-item>
-                      #end
+                  #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
+                    </el-form-item>
                   #elseif($column.htmlType == "imageUpload")## 图片上传
                       #set ($hasImageUploadColumn = true)
                     <el-form-item label="${comment}">
-                      <imageUpload v-model="form.${javaField}"/>
+                      <ImageUpload v-model="formData.${javaField}"/>
                     </el-form-item>
                   #elseif($column.htmlType == "fileUpload")## 文件上传
                       #set ($hasFileUploadColumn = true)
                     <el-form-item label="${comment}">
-                      <fileUpload v-model="form.${javaField}"/>
+                      <FileUpload v-model="formData.${javaField}"/>
                     </el-form-item>
                   #elseif($column.htmlType == "editor")## 文本编辑器
                       #set ($hasEditorColumn = true)
                     <el-form-item label="${comment}">
-                      <editor v-model="form.${javaField}" :min-height="192"/>
+                      <Editor v-model="formData.${javaField}" :min-height="192"/>
                     </el-form-item>
                   #elseif($column.htmlType == "select")## 下拉框
                     <el-form-item label="${comment}" prop="${javaField}">
-                      <el-select v-model="form.${javaField}" placeholder="请选择${comment}">
+                      <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
                           #if ("" != $dictType)## 有数据字典
                             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
                                        :key="dict.value" :label="dict.label" #if ($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end />
@@ -52,7 +50,7 @@
                     </el-form-item>
                   #elseif($column.htmlType == "checkbox")## 多选框
                     <el-form-item label="${comment}" prop="${javaField}">
-                      <el-checkbox-group v-model="form.${javaField}">
+                      <el-checkbox-group v-model="formData.${javaField}">
                           #if ("" != $dictType)## 有数据字典
                             <el-checkbox v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
                                          :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-checkbox>
@@ -63,7 +61,7 @@
                     </el-form-item>
                   #elseif($column.htmlType == "radio")## 单选框
                     <el-form-item label="${comment}" prop="${javaField}">
-                      <el-radio-group v-model="form.${javaField}">
+                      <el-radio-group v-model="formData.${javaField}">
                           #if ("" != $dictType)## 有数据字典
                             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
                                       :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"
@@ -75,18 +73,18 @@
                     </el-form-item>
                   #elseif($column.htmlType == "datetime")## 时间框
                     <el-form-item label="${comment}" prop="${javaField}">
-                      <el-date-picker clearable v-model="form.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
+                      <el-date-picker clearable v-model="formData.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
                     </el-form-item>
                   #elseif($column.htmlType == "textarea")## 文本框
                     <el-form-item label="${comment}" prop="${javaField}">
-                      <el-input v-model="form.${javaField}" type="textarea" placeholder="请输入内容" />
+                      <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入内容" />
                     </el-form-item>
                   #end
               #end
           #end
       </el-form>
         ## 特殊：主子表专属逻辑
-        #if ( $subTables && $subTables.size() > 0 )
+        #if ( $table.templateType == 10 || $table.templateType == 12 )
           <!-- 子表的表单 -->
           <el-tabs v-model="subTabsName">
               #foreach ($subTable in $subTables)
@@ -121,17 +119,17 @@
   #end
   ## 特殊：树表专属逻辑
   #if ( $table.templateType == 2 )
-  import Treeselect from "@riophae/vue-treeselect";
+  import TreeSelect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   #end
   ## 特殊：主子表专属逻辑
-  #if ( $subTables && $subTables.size() > 0 )
-  #foreach ($subSimpleClassName in $subSimpleClassNames)
-  import ${subSimpleClassName}Form from './components/${subSimpleClassName}Form.vue'
-  #end
+  #if ( $table.templateType == 10 || $table.templateType == 12 )
+      #foreach ($subSimpleClassName in $subSimpleClassNames)
+      import ${subSimpleClassName}Form from './components/${subSimpleClassName}Form.vue'
+      #end
   #end
   export default {
-    name: "${simpleClassName}",
+    name: "${simpleClassName}Form",
     components: {
         #if ($hasImageUploadColumn)
           ImageUpload,
@@ -144,13 +142,13 @@
         #end
         ## 特殊：树表专属逻辑
         #if ( $table.templateType == 2 )
-          Treeselect,
+          TreeSelect,
         #end
         ## 特殊：主子表专属逻辑
-        #if ( $subTables && $subTables.size() > 0 )
-        #foreach ($subSimpleClassName in $subSimpleClassNames)
-          ${subSimpleClassName}Form,
-        #end
+        #if ( $table.templateType == 10 || $table.templateType == 12 )
+            #foreach ($subSimpleClassName in $subSimpleClassNames)
+               ${subSimpleClassName}Form,
+            #end
         #end
     },
     data() {
@@ -178,7 +176,7 @@
             #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 }],
+                        $column.javaField: [{ required: true, message: '${comment}不能为空', trigger: #if($column.htmlType == 'select')'change'#else'blur'#end }],
                 #end
             #end
         },
@@ -186,43 +184,16 @@
           #if ( $table.templateType == 2 )
              ${classNameVar}Tree: [], // 树形结构
           #end
-          ## 特殊：主子表专属逻辑
-          #if ( $subTables && $subTables.size() > 0 )
+        ## 特殊：主子表专属逻辑
+        #if ( $table.templateType == 10 || $table.templateType == 12 )
+        #if ( $subTables && $subTables.size() > 0 )
             /** 子表的表单 */
              subTabsName: '$subClassNameVars.get(0)'
-          #end
+        #end
+        #end
       };
     },
     methods: {
-        ## 特殊：树表专属逻辑
-        #if ( $table.templateType == 2 )
-          /** 转换${table.classComment}数据结构 */
-          normalizer(node) {
-            if (node.children && !node.children.length) {
-              delete node.children;
-            }
-            return {
-              id: node.id,
-              label: node.name,
-              children: node.children
-            };
-          },
-        #end
-      /** 表单重置 */
-      reset() {
-        this.formData = {
-            #foreach ($column in $columns)
-                #if ($column.createOperation || $column.updateOperation)
-                    #if ($column.htmlType == "checkbox")
-                            $column.javaField: [],
-                    #else
-                            $column.javaField: undefined,
-                    #end
-                #end
-            #end
-        };
-        this.resetForm("formRef");
-      },
       /** 打开弹窗 */
      open(id) {
         this.dialogVisible = true;
@@ -246,88 +217,151 @@
             this.get${simpleClassName}Tree()
         #end
       },
+      /** 提交按钮 */
+      submitForm() {
+        this.formLoading = true;
+        try {
+          const that = this;
+          let data = this.formData;
+          let validate = false;
+          // 校验主表
+          this.getRef("formRef").validate(valid => {
+            validate = valid;
+          });
+        ## 特殊：主子表专属逻辑
+        #if ( $table.templateType == 10 || $table.templateType == 12 )
+        #if ( $subTables && $subTables.size() > 0 )
+            // 校验子表
+            this.validateSubFrom01().then(() => {
+            // 全部校验通过-拼接子表的数据
+            // 拼接子表的数据
+              #foreach ($subTable in $subTables)
+                  #set ($index = $foreach.count - 1)
+                  #set ($subClassNameVar = $subClassNameVars.get($index))
+                data.${subClassNameVar}#if ( $subTable.subJoinMany)s#end = that.getRef('${subClassNameVar}FormRef').getData();
+              #end
+            }).catch((err) => {
+                validate = false
+                that.subTabsName = err.replace("FormRef", ""); // 定位到没有校验通过的子表单
+            })
+        #end
+        #end
+          // 所有表单校验通过后方可提交
+          if (!validate) {
+            return;
+          }
+          // 修改的提交
+          if (data.${primaryColumn.javaField}) {
+                  ${simpleClassName}Api.update${simpleClassName}(data).then(response => {
+              that.#[[$modal]]#.msgSuccess("修改成功");
+              that.dialogVisible = false;
+              that.#[[$]]#emit('success');
+            });
+            return;
+          }
+          // 添加的提交
+          ${simpleClassName}Api.create${simpleClassName}(data).then(response => {
+            that.#[[$modal]]#.msgSuccess("新增成功");
+            that.dialogVisible = false;
+            that.#[[$]]#emit('success');
+          });
+        }finally {
+          this.formLoading = false
+        }
+      },
+      getRef(refName){ // TODO puhui999: 获得表单 ref，提取出来的目的呢是解决 #[[$]]# 在 if 中 end闭合不了的问题，代码生成后可删除此方法
+        return this.#[[$]]#refs[refName]
+      },
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 10 || $table.templateType == 12 )
+#if ( $subTables && $subTables.size() > 0 )
+      /** 校验子表单 */
+      validateSubFrom(item) {
+        return new Promise((resolve, reject) => {
+          this.$refs[item].validate()
+          .then(() => {
+            resolve()
+          })
+          .catch(() => {
+            reject(item)
+          })
+        })
+      },
+      /** 校验所有子表单 */
+      validateSubFrom01() {
+        // 需要校验的表单 ref
+        const validFormRefArr = [
+            #foreach ($subTable in $subTables)
+                #set ($index = $foreach.count - 1)
+                #set ($subClassNameVar = $subClassNameVars.get($index))
+              "${subClassNameVar}FormRef",
+            #end
+        ];
+        const validArr = []; // 校验
+        for (const item of validFormRefArr) {
+          validArr.push(this.validateSubFrom(item))
+        }
+        return new Promise((resolve, reject) => {
+          // 校验所有
+          Promise.all(validArr).then(() => {
+            resolve()
+          }).catch((err) => {
+            reject(err)
+          })
+        })
+      },
+#end
+#end
         ## 特殊：树表专属逻辑
         #if ( $table.templateType == 2 )
           /** 获得${table.classComment}树 */
           get${simpleClassName}Tree() {
             const that = this;
             that.${classNameVar}Tree = [];
-            ${simpleClassName}Api.get${simpleClassName}List().then(res=>{
+                  ${simpleClassName}Api.get${simpleClassName}List().then(res=>{
               const root = { id: 0, name: '顶级${table.classComment}', children: [] };
               root.children = this.handleTree(res.data, 'id', '${treeParentColumn.javaField}')
               that.${classNameVar}Tree.push(root)
             });
           },
         #end
-
-      /** 提交按钮 */
-      submitForm() {
-        this.formLoading = true;
-        try {
-          let data = this.formData;
-## 特殊：主子表专属逻辑
-#if ( $subTables && $subTables.size() > 0 )
-          // 需要校验的表单 ref
-          const validFormRefArr = [
-              #foreach ($subTable in $subTables)
-                  #set ($index = $foreach.count - 1)
-                  #set ($subClassNameVar = $subClassNameVars.get($index))
-                "${subClassNameVar}FormRef",
+        ## 特殊：树表专属逻辑
+        #if ( $table.templateType == 2 )
+          /** 转换${table.classComment}数据结构 */
+          normalizer(node) {
+            if (node.children && !node.children.length) {
+              delete node.children;
+            }
+              #if ($treeNameColumn.javaField == "name")
+                return {
+                  id: node.id,
+                  label: node.name,
+                  children: node.children
+                };
+              #else
+                return {
+                  id: node.id,
+                  label: node['$treeNameColumn.javaField'],
+                  children: node.children
+                };
               #end
-          ];
-
-          const validArr = []; // 校验
-          const that = this;
-          validFormRefArr.forEach((item, index) => {
-            validArr.push(new Promise((resolve, reject) => {
-              that.getRef(item).validate(valid => {
-                if (valid){ // 校验成功
-                  resolve()
-                }else {
-                  reject(item.replace("FormRef","")) // 校验失败返回对应的表单
-                }
-              })
-            }))})
-          Promise.all(validArr).then(() => {
-            // 全部校验通过-拼接子表的数据
-            // 拼接子表的数据
-              #foreach ($subTable in $subTables)
-                  #set ($index = $foreach.count - 1)
-                  #set ($subClassNameVar = $subClassNameVars.get($index))
-                data.${subClassNameVar}#if ( $subTable.subJoinMany)s#end = that.getRef(${subClassNameVar}FormRef).getData()
-              #end
-          }).catch((err)=>{
-            that.subTabsName = err
-          })
-#end
-
-        this.getRef("formRef").validate(valid => {
-          if (!valid) {
-            return;
-          }
-          // 修改的提交
-          if (data.${primaryColumn.javaField}) {
-            ${simpleClassName}Api.update${simpleClassName}(data).then(response => {
-              this.#[[$modal]]#.msgSuccess("修改成功");
-              this.dialogVisible = false;
-              this.#[[$]]#emit('success');
-            });
-            return;
-          }
-          // 添加的提交
-          ${simpleClassName}Api.create${simpleClassName}(data).then(response => {
-            this.#[[$modal]]#.msgSuccess("新增成功");
-            this.dialogVisible = false;
-            this.#[[$]]#emit('success');
-          });
-        });
-        }finally {
-          this.formLoading = false
-        }
+          },
+        #end
+      /** 表单重置 */
+      reset() {
+        this.formData = {
+            #foreach ($column in $columns)
+                #if ($column.createOperation || $column.updateOperation)
+                    #if ($column.htmlType == "checkbox")
+                            $column.javaField: [],
+                    #else
+                            $column.javaField: undefined,
+                    #end
+                #end
+            #end
+        };
+        this.resetForm("formRef");
       },
-      getRef(refName){
-        this.#[[$]]#refs[refName]
-      }
     }
   };
 </script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
index 58b41890d..33ec21596 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
@@ -54,6 +54,7 @@
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                    v-hasPermi="['${permissionPrefix}:export']">导出</el-button>
       </el-col>
+        ## 特殊：树表专属逻辑
         #if ( $table.templateType == 2 )
           <el-col :span="1.5">
             <el-button type="danger" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">
@@ -64,7 +65,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-      ## 特殊：主子表专属逻辑 TODO puhui999: 普通模式
+      ## 特殊：主子表专属逻辑
       #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
       <el-table
           v-loading="loading"
@@ -89,7 +90,7 @@
       #else
       <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       #end
-      ## 特殊：主子表专属逻辑 TODO puhui999: 内嵌模式
+      ## 特殊：主子表专属逻辑
       #if ( $table.templateType == 12 && $subTables && $subTables.size() > 0 )
         <!-- 子表的列表 -->
         <el-table-column type="expand">
@@ -140,13 +141,15 @@
         </template>
       </el-table-column>
     </el-table>
+## 特殊：树表专属逻辑（树不需要分页）
+#if ( $table.templateType != 2 )
     <!-- 分页组件 -->
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
-
+#end
     <!-- 对话框(添加 / 修改) -->
     <${simpleClassName}Form ref="formRef" @success="getList" />
-  ## 特殊：主子表专属逻辑  TODO puhui999: ERP 模式
+  ## 特殊：主子表专属逻辑
   #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
     <!-- 子表的列表 -->
       <el-tabs model-value="$subClassNameVars.get(0)">
@@ -177,21 +180,25 @@ import FileUpload from '@/components/FileUpload';
 import Editor from '@/components/Editor';
 #end
 ## 特殊：主子表专属逻辑
+#if ( $table.templateType != 10 )
 #if ( $subTables && $subTables.size() > 0 )
     #foreach ($subSimpleClassName in $subSimpleClassNames)
     import ${subSimpleClassName}List from './components/${subSimpleClassName}List.vue'
     #end
 #end
+#end
 export default {
   name: "${simpleClassName}",
   components: {
           ${simpleClassName}Form,
 ## 特殊：主子表专属逻辑
+#if ( $table.templateType != 10 )
 #if ( $subTables && $subTables.size() > 0 )
       #foreach ($subSimpleClassName in $subSimpleClassNames)
           ${subSimpleClassName}List,
       #end
 #end
+#end
 #if ($hasImageUploadColumn)
     ImageUpload,
 #end
@@ -210,9 +217,9 @@ export default {
       exportLoading: false,
       // 显示搜索条件
       showSearch: true,
-      // 总条数
       ## 特殊：树表专属逻辑（树不需要分页接口）
       #if ( $table.templateType != 2 )
+        // 总条数
         total: 0,
       #end
       // ${table.classComment}列表
@@ -235,7 +242,7 @@ export default {
         #if ($column.listOperationCondition != 'BETWEEN')
         $column.javaField: null,
         #end
-        #if ($column.htmlType == "datetime" || $column.listOperationCondition == "BETWEEN")
+        #if ($column.htmlType == "datetime" && $column.listOperationCondition == "BETWEEN")
         $column.javaField: [],
         #end
         #end
@@ -253,7 +260,7 @@ export default {
       this.loading = true;
       ## 特殊：树表专属逻辑（树不需要分页接口）
       #if ( $table.templateType == 2 )
-        ${simpleClassName}Api.get${simpleClassName}List(queryParams).then(response => {
+        ${simpleClassName}Api.get${simpleClassName}List(this.queryParams).then(response => {
           this.list = this.handleTree(response.data, 'id', '${treeParentColumn.javaField}');
         })
       #else
@@ -302,14 +309,14 @@ export default {
               return ${simpleClassName}Api.export${simpleClassName}Excel(params);
             }).then(response => {
               that.#[[$]]#download.excel(response, '${table.classComment}.xls');
-            }));
+            });
       } catch {
       } finally {
         that.exportLoading = false;
       }
     },
       ## 特殊：主子表专属逻辑
-      #if ( $subTables && $subTables.size() > 0 )
+      #if ( $table.templateType == 11 )
         /** 选中行操作 */
         handleCurrentChange(row) {
          this.currentRow = row
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
index 1c1553622..c1595798d 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
@@ -1,137 +1,137 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="100px"
+        v-loading="formLoading"
     >
-#foreach($column in $columns)
-    #if ($column.createOperation || $column.updateOperation)
-        #set ($dictType = $column.dictType)
-        #set ($javaField = $column.javaField)
-        #set ($javaType = $column.javaType)
-        #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-        #set ($comment = $column.columnComment)
-        #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
-        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-            #set ($dictMethod = "getIntDictOptions")
-        #elseif ($javaType == "String")
-            #set ($dictMethod = "getStrDictOptions")
-        #elseif ($javaType == "Boolean")
-            #set ($dictMethod = "getBoolDictOptions")
+        #foreach($column in $columns)
+            #if ($column.createOperation || $column.updateOperation)
+                #set ($dictType = $column.dictType)
+                #set ($javaField = $column.javaField)
+                #set ($javaType = $column.javaType)
+                #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                #set ($comment = $column.columnComment)
+                #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
+                #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                    #set ($dictMethod = "getIntDictOptions")
+                #elseif ($javaType == "String")
+                    #set ($dictMethod = "getStrDictOptions")
+                #elseif ($javaType == "Boolean")
+                    #set ($dictMethod = "getBoolDictOptions")
+                #end
+                #if ( $table.templateType == 2 && $column.id == $treeParentColumn.id )
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <el-tree-select
+                        v-model="formData.${javaField}"
+                        :data="${classNameVar}Tree"
+                        #if ($treeNameColumn.javaField == "name")
+                        :props="defaultProps"
+                        #else
+                        :props="{...defaultProps, label: '$treeNameColumn.javaField'}"
+                        #end
+                        check-strictly
+                        default-expand-all
+                        placeholder="请选择${comment}"
+                    />
+                  </el-form-item>
+                #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
+                  </el-form-item>
+                #elseif($column.htmlType == "imageUpload")## 图片上传
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <UploadImg v-model="formData.${javaField}" />
+                  </el-form-item>
+                #elseif($column.htmlType == "fileUpload")## 文件上传
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <UploadFile v-model="formData.${javaField}" />
+                  </el-form-item>
+                #elseif($column.htmlType == "editor")## 文本编辑器
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <Editor v-model="formData.${javaField}" height="150px" />
+                  </el-form-item>
+                #elseif($column.htmlType == "select")## 下拉框
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
+                        #if ("" != $dictType)## 有数据字典
+                          <el-option
+                              v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+                              :key="dict.value"
+                              :label="dict.label"
+                              :value="dict.value"
+                          />
+                        #else##没数据字典
+                          <el-option label="请选择字典生成" value="" />
+                        #end
+                    </el-select>
+                  </el-form-item>
+                #elseif($column.htmlType == "checkbox")## 多选框
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <el-checkbox-group v-model="formData.${javaField}">
+                        #if ("" != $dictType)## 有数据字典
+                          <el-checkbox
+                              v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+                              :key="dict.value"
+                              :label="dict.value"
+                          >
+                            {{ dict.label }}
+                          </el-checkbox>
+                        #else##没数据字典
+                          <el-checkbox>请选择字典生成</el-checkbox>
+                        #end
+                    </el-checkbox-group>
+                  </el-form-item>
+                #elseif($column.htmlType == "radio")## 单选框
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <el-radio-group v-model="formData.${javaField}">
+                        #if ("" != $dictType)## 有数据字典
+                          <el-radio
+                              v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+                              :key="dict.value"
+                              :label="dict.value"
+                          >
+                            {{ dict.label }}
+                          </el-radio>
+                        #else##没数据字典
+                          <el-radio label="1">请选择字典生成</el-radio>
+                        #end
+                    </el-radio-group>
+                  </el-form-item>
+                #elseif($column.htmlType == "datetime")## 时间框
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <el-date-picker
+                        v-model="formData.${javaField}"
+                        type="date"
+                        value-format="x"
+                        placeholder="选择${comment}"
+                    />
+                  </el-form-item>
+                #elseif($column.htmlType == "textarea")## 文本框
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
+                  </el-form-item>
+                #end
+            #end
         #end
-        #if ( $table.templateType == 2 && $column.id == $treeParentColumn.id )
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-tree-select
-          v-model="formData.${javaField}"
-          :data="${classNameVar}Tree"
-          #if ($treeNameColumn.javaField == "name")
-          :props="defaultProps"
-          #else
-          :props="{...defaultProps, label: '$treeNameColumn.javaField'}"
-          #end
-          check-strictly
-          default-expand-all
-          placeholder="请选择${comment}"
-        />
-      </el-form-item>
-        #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
-      </el-form-item>
-        #elseif($column.htmlType == "imageUpload")## 图片上传
-      <el-form-item label="${comment}" prop="${javaField}">
-        <UploadImg v-model="formData.${javaField}" />
-      </el-form-item>
-        #elseif($column.htmlType == "fileUpload")## 文件上传
-      <el-form-item label="${comment}" prop="${javaField}">
-        <UploadFile v-model="formData.${javaField}" />
-      </el-form-item>
-        #elseif($column.htmlType == "editor")## 文本编辑器
-      <el-form-item label="${comment}" prop="${javaField}">
-        <Editor v-model="formData.${javaField}" height="150px" />
-      </el-form-item>
-        #elseif($column.htmlType == "select")## 下拉框
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
-                #if ("" != $dictType)## 有数据字典
-          <el-option
-            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-                #else##没数据字典
-          <el-option label="请选择字典生成" value="" />
-                #end
-        </el-select>
-      </el-form-item>
-        #elseif($column.htmlType == "checkbox")## 多选框
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-checkbox-group v-model="formData.${javaField}">
-                #if ("" != $dictType)## 有数据字典
-          <el-checkbox
-            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-checkbox>
-                #else##没数据字典
-          <el-checkbox>请选择字典生成</el-checkbox>
-                #end
-        </el-checkbox-group>
-      </el-form-item>
-        #elseif($column.htmlType == "radio")## 单选框
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-radio-group v-model="formData.${javaField}">
-                #if ("" != $dictType)## 有数据字典
-          <el-radio
-            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-                #else##没数据字典
-          <el-radio label="1">请选择字典生成</el-radio>
-                #end
-        </el-radio-group>
-      </el-form-item>
-        #elseif($column.htmlType == "datetime")## 时间框
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-date-picker
-          v-model="formData.${javaField}"
-          type="date"
-          value-format="x"
-          placeholder="选择${comment}"
-        />
-      </el-form-item>
-        #elseif($column.htmlType == "textarea")## 文本框
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
-      </el-form-item>
-        #end
-    #end
-#end
     </el-form>
-## 特殊：主子表专属逻辑
-#if ( $table.templateType == 10 || $table.templateType == 12 )
-    <!-- 子表的表单 -->
-    <el-tabs v-model="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))
-      <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
-        <${subSimpleClassName}Form ref="${subClassNameVar}FormRef" :${subJoinColumn_strikeCase}="formData.id" />
-      </el-tab-pane>
-    #end
-    </el-tabs>
-#end
+      ## 特殊：主子表专属逻辑
+      #if ( $table.templateType == 10 || $table.templateType == 12 )
+        <!-- 子表的表单 -->
+        <el-tabs v-model="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))
+              <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
+                <${subSimpleClassName}Form ref="${subClassNameVar}FormRef" :${subJoinColumn_strikeCase}="formData.id" />
+              </el-tab-pane>
+            #end
+        </el-tabs>
+      #end
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -139,160 +139,160 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
-## 特殊：树表专属逻辑
-#if ( $table.templateType == 2 )
-import { defaultProps, handleTree } from '@/utils/tree'
-#end
-## 特殊：主子表专属逻辑
-#if ( $table.templateType == 10 || $table.templateType == 12 )
-#foreach ($subSimpleClassName in $subSimpleClassNames)
-import ${subSimpleClassName}Form from './components/${subSimpleClassName}Form.vue'
-#end
-#end
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-#foreach ($column in $columns)
-    #if ($column.createOperation || $column.updateOperation)
-      #if ($column.htmlType == "checkbox")
-  $column.javaField: [],
-      #else
-  $column.javaField: undefined,
+  import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+      ## 特殊：树表专属逻辑
+      #if ( $table.templateType == 2 )
+      import { defaultProps, handleTree } from '@/utils/tree'
+      #end
+      ## 特殊：主子表专属逻辑
+      #if ( $table.templateType == 10 || $table.templateType == 12 )
+          #foreach ($subSimpleClassName in $subSimpleClassNames)
+          import ${subSimpleClassName}Form from './components/${subSimpleClassName}Form.vue'
+          #end
       #end
-    #end
-#end
-})
-const formRules = reactive({
-#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
-})
-const formRef = ref() // 表单 Ref
-## 特殊：树表专属逻辑
-#if ( $table.templateType == 2 )
-const ${classNameVar}Tree = ref() // 树形结构
-#end
-## 特殊：主子表专属逻辑
-#if ( $table.templateType == 10 || $table.templateType == 12 )
-#if ( $subTables && $subTables.size() > 0 )
 
-/** 子表的表单 */
-const subTabsName = ref('$subClassNameVars.get(0)')
-#foreach ($subClassNameVar in $subClassNameVars)
-const ${subClassNameVar}FormRef = ref()
-#end
-#end
-#end
+  const { t } = useI18n() // 国际化
+  const message = useMessage() // 消息弹窗
 
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
+  const dialogVisible = ref(false) // 弹窗的是否展示
+  const dialogTitle = ref('') // 弹窗的标题
+  const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+  const formType = ref('') // 表单的类型：create - 新增；update - 修改
+  const formData = ref({
+      #foreach ($column in $columns)
+          #if ($column.createOperation || $column.updateOperation)
+              #if ($column.htmlType == "checkbox")
+                      $column.javaField: [],
+              #else
+                      $column.javaField: undefined,
+              #end
+          #end
+      #end
+  })
+  const formRules = reactive({
+      #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
+  })
+  const formRef = ref() // 表单 Ref
+      ## 特殊：树表专属逻辑
+      #if ( $table.templateType == 2 )
+      const ${classNameVar}Tree = ref() // 树形结构
+      #end
+      ## 特殊：主子表专属逻辑
+      #if ( $table.templateType == 10 || $table.templateType == 12 )
+          #if ( $subTables && $subTables.size() > 0 )
+
+          /** 子表的表单 */
+          const subTabsName = ref('$subClassNameVars.get(0)')
+              #foreach ($subClassNameVar in $subClassNameVars)
+              const ${subClassNameVar}FormRef = ref()
+              #end
+          #end
+      #end
+
+  /** 打开弹窗 */
+  const open = async (type: string, id?: number) => {
+    dialogVisible.value = true
+    dialogTitle.value = t('action.' + type)
+    formType.value = type
+    resetForm()
+    // 修改时，设置数据
+    if (id) {
+      formLoading.value = true
+      try {
+        formData.value = await ${simpleClassName}Api.get${simpleClassName}(id)
+      } finally {
+        formLoading.value = false
+      }
+    }
+      ## 特殊：树表专属逻辑
+      #if ( $table.templateType == 2 )
+        await get${simpleClassName}Tree()
+      #end
+  }
+  defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+  /** 提交表单 */
+  const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+  const submitForm = async () => {
+    // 校验表单
+    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))
+                try {
+                  await ${subClassNameVar}FormRef.value.validate()
+                } catch (e) {
+                  subTabsName.value = '${subClassNameVar}'
+                  return
+                }
+              #end
+          #end
+      #end
+    // 提交请求
     formLoading.value = true
     try {
-      formData.value = await ${simpleClassName}Api.get${simpleClassName}(id)
+      const data = formData.value as unknown as ${simpleClassName}Api.${simpleClassName}VO
+        ## 特殊：主子表专属逻辑
+        #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))
+                  data.${subClassNameVar}#if ( $subTable.subJoinMany)s#end = ${subClassNameVar}FormRef.value.getData()
+                #end
+            #end
+        #end
+      if (formType.value === 'create') {
+        await ${simpleClassName}Api.create${simpleClassName}(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ${simpleClassName}Api.update${simpleClassName}(data)
+        message.success(t('common.updateSuccess'))
+      }
+      dialogVisible.value = false
+      // 发送操作成功的事件
+      emit('success')
     } finally {
       formLoading.value = false
     }
   }
-## 特殊：树表专属逻辑
-#if ( $table.templateType == 2 )
-  await get${simpleClassName}Tree()
-#end
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  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))
-  try {
-    await ${subClassNameVar}FormRef.value.validate()
-  } catch (e) {
-    subTabsName.value = '${subClassNameVar}'
-    return
-  }
-  #end
-#end
-#end
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as ${simpleClassName}Api.${simpleClassName}VO
-## 特殊：主子表专属逻辑
-#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))
-    data.${subClassNameVar}#if ( $subTable.subJoinMany)s#end = ${subClassNameVar}FormRef.value.getData()
-  #end
-#end
-#end
-    if (formType.value === 'create') {
-      await ${simpleClassName}Api.create${simpleClassName}(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await ${simpleClassName}Api.update${simpleClassName}(data)
-      message.success(t('common.updateSuccess'))
+  /** 重置表单 */
+  const 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
     }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
+    formRef.value?.resetFields()
   }
-}
+      ## 特殊：树表专属逻辑
+      #if ( $table.templateType == 2 )
 
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-#foreach ($column in $columns)
-  #if ($column.createOperation || $column.updateOperation)
-      #if ($column.htmlType == "checkbox")
-    $column.javaField: [],
-      #else
-    $column.javaField: undefined,
+      /** 获得${table.classComment}树 */
+      const get${simpleClassName}Tree = async () => {
+              ${classNameVar}Tree.value = []
+        const data = await ${simpleClassName}Api.get${simpleClassName}List()
+        const root: Tree = { id: 0, name: '顶级${table.classComment}', children: [] }
+        root.children = handleTree(data, 'id', '${treeParentColumn.javaField}')
+              ${classNameVar}Tree.value.push(root)
+      }
       #end
-  #end
-#end
-  }
-  formRef.value?.resetFields()
-}
-## 特殊：树表专属逻辑
-#if ( $table.templateType == 2 )
-
-/** 获得${table.classComment}树 */
-const get${simpleClassName}Tree = async () => {
-  ${classNameVar}Tree.value = []
-  const data = await ${simpleClassName}Api.get${simpleClassName}List()
-  const root: Tree = { id: 0, name: '顶级${table.classComment}', children: [] }
-  root.children = handleTree(data, 'id', '${treeParentColumn.javaField}')
-  ${classNameVar}Tree.value.push(root)
-}
-#end
 </script>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index 13c448054..d7794b0ff 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -2,372 +2,375 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="68px"
     >
-    #foreach($column in $columns)
-        #if ($column.listOperation)
-            #set ($dictType = $column.dictType)
-            #set ($javaField = $column.javaField)
-            #set ($javaType = $column.javaType)
-            #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-            #set ($comment = $column.columnComment)
-            #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
-            #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-                #set ($dictMethod = "getIntDictOptions")
-            #elseif ($javaType == "String")
-                #set ($dictMethod = "getStrDictOptions")
-            #elseif ($javaType == "Boolean")
-                #set ($dictMethod = "getBoolDictOptions")
-            #end
-            #if ($column.htmlType == "input")
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-input
-          v-model="queryParams.${javaField}"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-            #elseif ($column.htmlType == "select" || $column.htmlType == "radio")
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-select
-          v-model="queryParams.${javaField}"
-          placeholder="请选择${comment}"
-          clearable
-          class="!w-240px"
-        >
-                #if ("" != $dictType)## 设置了 dictType 数据字典的情况
-          <el-option
-            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-                #else## 未设置 dictType 数据字典的情况
-          <el-option label="请选择字典生成" value="" />
+        #foreach($column in $columns)
+            #if ($column.listOperation)
+                #set ($dictType = $column.dictType)
+                #set ($javaField = $column.javaField)
+                #set ($javaType = $column.javaType)
+                #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                #set ($comment = $column.columnComment)
+                #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
+                #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                    #set ($dictMethod = "getIntDictOptions")
+                #elseif ($javaType == "String")
+                    #set ($dictMethod = "getStrDictOptions")
+                #elseif ($javaType == "Boolean")
+                    #set ($dictMethod = "getBoolDictOptions")
                 #end
-        </el-select>
-      </el-form-item>
-    #elseif($column.htmlType == "datetime")
-      #if ($column.listOperationCondition != "BETWEEN")## 非范围
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-date-picker
-          v-model="queryParams.${javaField}"
-          value-format="YYYY-MM-DD"
-          type="date"
-          placeholder="选择${comment}"
-          clearable
-          class="!w-240px"
-        />
-      </el-form-item>
-      #else## 范围
-      <el-form-item label="${comment}" prop="${javaField}">
-        <el-date-picker
-          v-model="queryParams.${javaField}"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      #end
-    #end
-    #end
-    #end
+                #if ($column.htmlType == "input")
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <el-input
+                        v-model="queryParams.${javaField}"
+                        placeholder="请输入${comment}"
+                        clearable
+                        @keyup.enter="handleQuery"
+                        class="!w-240px"
+                    />
+                  </el-form-item>
+                #elseif ($column.htmlType == "select" || $column.htmlType == "radio")
+                  <el-form-item label="${comment}" prop="${javaField}">
+                    <el-select
+                        v-model="queryParams.${javaField}"
+                        placeholder="请选择${comment}"
+                        clearable
+                        class="!w-240px"
+                    >
+                        #if ("" != $dictType)## 设置了 dictType 数据字典的情况
+                          <el-option
+                              v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+                              :key="dict.value"
+                              :label="dict.label"
+                              :value="dict.value"
+                          />
+                        #else## 未设置 dictType 数据字典的情况
+                          <el-option label="请选择字典生成" value="" />
+                        #end
+                    </el-select>
+                  </el-form-item>
+                #elseif($column.htmlType == "datetime")
+                    #if ($column.listOperationCondition != "BETWEEN")## 非范围
+                      <el-form-item label="${comment}" prop="${javaField}">
+                        <el-date-picker
+                            v-model="queryParams.${javaField}"
+                            value-format="YYYY-MM-DD"
+                            type="date"
+                            placeholder="选择${comment}"
+                            clearable
+                            class="!w-240px"
+                        />
+                      </el-form-item>
+                    #else## 范围
+                      <el-form-item label="${comment}" prop="${javaField}">
+                        <el-date-picker
+                            v-model="queryParams.${javaField}"
+                            value-format="YYYY-MM-DD HH:mm:ss"
+                            type="daterange"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+                            class="!w-240px"
+                        />
+                      </el-form-item>
+                    #end
+                #end
+            #end
+        #end
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
         <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['${permissionPrefix}:create']"
+            type="primary"
+            plain
+            @click="openForm('create')"
+            v-hasPermi="['${permissionPrefix}:create']"
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
         <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['${permissionPrefix}:export']"
+            type="success"
+            plain
+            @click="handleExport"
+            :loading="exportLoading"
+            v-hasPermi="['${permissionPrefix}:export']"
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
-## 特殊：树表专属逻辑
-#if ( $table.templateType == 2 )
-        <el-button type="danger" plain @click="toggleExpandAll">
-          <Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
-        </el-button>
-#end
+          ## 特殊：树表专属逻辑
+          #if ( $table.templateType == 2 )
+            <el-button type="danger" plain @click="toggleExpandAll">
+              <Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
+            </el-button>
+          #end
       </el-form-item>
     </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
-## 特殊：主子表专属逻辑  TODO puhui999: 普通模式
-#if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
-    <el-table
-      v-loading="loading"
-      :data="list"
-      :stripe="true"
-      :show-overflow-tooltip="true"
-      highlight-current-row
-      @current-change="handleCurrentChange"
-    >
-## 特殊：树表专属逻辑
-#elseif ( $table.templateType == 2 )
-    <el-table
-      v-loading="loading"
-      :data="list"
-      :stripe="true"
-      :show-overflow-tooltip="true"
-      row-key="id"
-      :default-expand-all="isExpandAll"
-      v-if="refreshTable"
-    >
-#else
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-#end
-## 特殊：主子表专属逻辑  TODO puhui999: 内嵌模式
-#if ( $table.templateType == 12 && $subTables && $subTables.size() > 0 )
-      <!-- 子表的列表 -->
-      <el-table-column type="expand">
-        <template #default="scope">
-          <el-tabs model-value="$subClassNameVars.get(0)">
-            #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))
-            <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
-              <${subSimpleClassName}List :${subJoinColumn_strikeCase}="scope.row.id" />
-            </el-tab-pane>
-            #end
-          </el-tabs>
-        </template>
-      </el-table-column>
-#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")## 时间类型
-      <el-table-column
-        label="${comment}"
-        align="center"
-        prop="${javaField}"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-        #elseif($column.dictType && "" != $column.dictType)## 数据字典
-      <el-table-column label="${comment}" align="center" prop="${javaField}">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.${column.javaField}" />
-        </template>
-      </el-table-column>
-        #else
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
-        #end
+      ## 特殊：主子表专属逻辑
+      #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
+      <el-table
+          v-loading="loading"
+          :data="list"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          highlight-current-row
+          @current-change="handleCurrentChange"
+      >
+          ## 特殊：树表专属逻辑
+      #elseif ( $table.templateType == 2 )
+      <el-table
+          v-loading="loading"
+          :data="list"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          row-key="id"
+          :default-expand-all="isExpandAll"
+          v-if="refreshTable"
+      >
+      #else
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       #end
-    #end
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
+      ## 特殊：主子表专属逻辑
+      #if ( $table.templateType == 12 && $subTables && $subTables.size() > 0 )
+        <!-- 子表的列表 -->
+        <el-table-column type="expand">
+          <template #default="scope">
+            <el-tabs model-value="$subClassNameVars.get(0)">
+                #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))
+                  <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
+                    <${subSimpleClassName}List :${subJoinColumn_strikeCase}="scope.row.id" />
+                  </el-tab-pane>
+                #end
+            </el-tabs>
+          </template>
+        </el-table-column>
+      #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")## 时间类型
+                <el-table-column
+                    label="${comment}"
+                    align="center"
+                    prop="${javaField}"
+                    :formatter="dateFormatter"
+                    width="180px"
+                />
+              #elseif($column.dictType && "" != $column.dictType)## 数据字典
+                <el-table-column label="${comment}" align="center" prop="${javaField}">
+                  <template #default="scope">
+                    <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.${column.javaField}" />
+                  </template>
+                </el-table-column>
+              #else
+                <el-table-column label="${comment}" align="center" prop="${javaField}" />
+              #end
+          #end
+      #end
+    <el-table-column label="操作" align="center">
+      <template #default="scope">
+        <el-button
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
             v-hasPermi="['${permissionPrefix}:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
+        >
+          编辑
+        </el-button>
+        <el-button
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
             v-hasPermi="['${permissionPrefix}:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        >
+          删除
+        </el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+## 特殊：树表专属逻辑（树不需要分页）
+#if ( $table.templateType != 2 )
     <!-- 分页 -->
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
+#end
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
   <${simpleClassName}Form ref="formRef" @success="getList" />
-## 特殊：主子表专属逻辑 TODO puhui999: ERP 模式
-#if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
-  <!-- 子表的列表 -->
-  <ContentWrap>
-    <el-tabs model-value="$subClassNameVars.get(0)">
-      #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))
-      <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
-        <${subSimpleClassName}List :${subJoinColumn_strikeCase}="currentRow.id" />
-      </el-tab-pane>
-      #end
-    </el-tabs>
-  </ContentWrap>
-#end
+    ## 特殊：主子表专属逻辑
+    #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
+      <!-- 子表的列表 -->
+      <ContentWrap>
+        <el-tabs model-value="$subClassNameVars.get(0)">
+            #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))
+              <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
+                <${subSimpleClassName}List :${subJoinColumn_strikeCase}="currentRow.id" />
+              </el-tab-pane>
+            #end
+        </el-tabs>
+      </ContentWrap>
+    #end
 </template>
 
 <script setup lang="ts">
-import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
-## 特殊：树表专属逻辑
-#if ( $table.templateType == 2 )
-import { handleTree } from '@/utils/tree'
-#end
-import download from '@/utils/download'
-import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
-import ${simpleClassName}Form from './${simpleClassName}Form.vue'
-## 特殊：主子表专属逻辑
-#if ( $subTables && $subTables.size() > 0 )
-#foreach ($subSimpleClassName in $subSimpleClassNames)
-import ${subSimpleClassName}List from './components/${subSimpleClassName}List.vue'
-#end
-#end
-
-defineOptions({ name: '${table.className}' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref([]) // 列表的数据
-## 特殊：树表专属逻辑（树不需要分页接口）
-#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: null,
-  #end
-      #if ($column.htmlType == "datetime" || $column.listOperationCondition == "BETWEEN")
-  $column.javaField: [],
+  import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+  import { dateFormatter } from '@/utils/formatTime'
+      ## 特殊：树表专属逻辑
+      #if ( $table.templateType == 2 )
+      import { handleTree } from '@/utils/tree'
+      #end
+  import download from '@/utils/download'
+  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+  import ${simpleClassName}Form from './${simpleClassName}Form.vue'
+      ## 特殊：主子表专属逻辑
+      #if ( $table.templateType != 10 )
+          #foreach ($subSimpleClassName in $subSimpleClassNames)
+          import ${subSimpleClassName}List from './components/${subSimpleClassName}List.vue'
+          #end
       #end
-    #end
-  #end
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
 
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-## 特殊：树表专属逻辑（树不需要分页接口）
-  #if ( $table.templateType == 2 )
-    const data = await ${simpleClassName}Api.get${simpleClassName}List(queryParams)
-    list.value = handleTree(data, 'id', '${treeParentColumn.javaField}')
-  #else
-    const data = await ${simpleClassName}Api.get${simpleClassName}Page(queryParams)
-    list.value = data.list
-    total.value = data.total
-  #end
-  } finally {
-    loading.value = false
+  defineOptions({ name: '${table.className}' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const loading = ref(true) // 列表的加载中
+  const list = ref([]) // 列表的数据
+      ## 特殊：树表专属逻辑（树不需要分页接口）
+      #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: null,
+              #end
+              #if ($column.htmlType == "datetime" || $column.listOperationCondition == "BETWEEN")
+                      $column.javaField: [],
+              #end
+          #end
+      #end
+  })
+  const queryFormRef = ref() // 搜索的表单
+  const exportLoading = ref(false) // 导出的加载中
+
+  /** 查询列表 */
+  const getList = async () => {
+    loading.value = true
+    try {
+        ## 特殊：树表专属逻辑（树不需要分页接口）
+        #if ( $table.templateType == 2 )
+          const data = await ${simpleClassName}Api.get${simpleClassName}List(queryParams)
+          list.value = handleTree(data, 'id', '${treeParentColumn.javaField}')
+        #else
+          const data = await ${simpleClassName}Api.get${simpleClassName}Page(queryParams)
+          list.value = data.list
+          total.value = data.total
+        #end
+    } finally {
+      loading.value = false
+    }
   }
-}
 
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ${simpleClassName}Api.delete${simpleClassName}(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await ${simpleClassName}Api.export${simpleClassName}(queryParams)
-    download.excel(data, '${table.classComment}.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
+  /** 搜索按钮操作 */
+  const handleQuery = () => {
+    queryParams.pageNo = 1
+    getList()
   }
-}
 
-## 特殊：主子表专属逻辑
-#if ( $subTables && $subTables.size() > 0 )
-/** 选中行操作 */
-const currentRow = ref({}) // 选中行
-const handleCurrentChange = (row) => {
-  currentRow.value = row
-}
-#end
-## 特殊：树表专属逻辑
-#if ( $table.templateType == 2 )
+  /** 重置按钮操作 */
+  const resetQuery = () => {
+    queryFormRef.value.resetFields()
+    handleQuery()
+  }
 
-/** 展开/折叠操作 */
-const isExpandAll = ref(true) // 是否展开，默认全部展开
-const refreshTable = ref(true) // 重新渲染表格状态
-const toggleExpandAll = async () => {
-  refreshTable.value = false
-  isExpandAll.value = !isExpandAll.value
-  await nextTick()
-  refreshTable.value = true
-}
-#end
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = (type: string, id?: number) => {
+    formRef.value.open(type, id)
+  }
 
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
+  /** 删除按钮操作 */
+  const handleDelete = async (id: number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await ${simpleClassName}Api.delete${simpleClassName}(id)
+      message.success(t('common.delSuccess'))
+      // 刷新列表
+      await getList()
+    } catch {}
+  }
+
+  /** 导出按钮操作 */
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await ${simpleClassName}Api.export${simpleClassName}(queryParams)
+      download.excel(data, '${table.classComment}.xls')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+      ## 特殊：主子表专属逻辑
+      #if ( $table.templateType == 11 )
+
+      /** 选中行操作 */
+      const currentRow = ref({}) // 选中行
+      const handleCurrentChange = (row) => {
+        currentRow.value = row
+      }
+      #end
+      ## 特殊：树表专属逻辑
+      #if ( $table.templateType == 2 )
+
+      /** 展开/折叠操作 */
+      const isExpandAll = ref(true) // 是否展开，默认全部展开
+      const refreshTable = ref(true) // 重新渲染表格状态
+      const toggleExpandAll = async () => {
+        refreshTable.value = false
+        isExpandAll.value = !isExpandAll.value
+        await nextTick()
+        refreshTable.value = true
+      }
+      #end
+
+  /** 初始化 **/
+  onMounted(() => {
+    getList()
+  })
 </script>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java
new file mode 100644
index 000000000..9513362b4
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java
@@ -0,0 +1,202 @@
+package cn.iocoder.yudao.module.infra.service.codegen.inner;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ZipUtil;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
+import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
+import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum;
+import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum;
+import cn.iocoder.yudao.module.infra.framework.codegen.config.CodegenProperties;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Spy;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * {@link CodegenEngine} 的单元测试
+ *
+ * @author 芋道源码
+ */
+public class CodegenEngineVue2Test extends BaseMockitoUnitTest {
+
+    @InjectMocks
+    private CodegenEngine codegenEngine;
+
+    @Spy
+    private CodegenProperties codegenProperties = new CodegenProperties()
+            .setBasePackage("cn.iocoder.yudao");
+
+    @BeforeEach
+    public void setUp() {
+        codegenEngine.initGlobalBindingMap();
+    }
+
+    @Test
+    public void testExecute_vue2_one() {
+        // 准备参数
+        CodegenTableDO table = getTable("student")
+                .setFrontType(CodegenFrontTypeEnum.VUE2.getType())
+                .setTemplateType(CodegenTemplateTypeEnum.ONE.getType());
+        List<CodegenColumnDO> columns = getColumnList("student");
+
+        // 调用
+        Map<String, String> result = codegenEngine.execute(table, columns, null, null);
+        // 断言
+        assertResult(result, "codegen/vue2_one");
+//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one");
+    }
+
+    @Test
+    public void testExecute_vue2_tree() {
+        // 准备参数
+        CodegenTableDO table = getTable("category")
+                .setFrontType(CodegenFrontTypeEnum.VUE2.getType())
+                .setTemplateType(CodegenTemplateTypeEnum.TREE.getType());
+        List<CodegenColumnDO> columns = getColumnList("category");
+
+        // 调用
+        Map<String, String> result = codegenEngine.execute(table, columns, null, null);
+        // 断言
+        assertResult(result, "codegen/vue2_tree");
+//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree");
+//        writeFile(result, "/Users/yunai/test/demo66.zip");
+    }
+
+    @Test
+    public void testExecute_vue2_master_normal() {
+        testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_NORMAL, "codegen/vue2_master_normal");
+    }
+
+    @Test
+    public void testExecute_vue2_master_erp() {
+        testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_ERP, "codegen/vue2_master_erp");
+    }
+
+    @Test
+    public void testExecute_vue2_master_inner() {
+        testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_INNER, "codegen/vue2_master_inner");
+    }
+
+    private void testExecute_vue2_master(CodegenTemplateTypeEnum templateType,
+                                         String path) {
+        // 准备参数
+        CodegenTableDO table = getTable("student")
+                .setFrontType(CodegenFrontTypeEnum.VUE2.getType())
+                .setTemplateType(templateType.getType());
+        List<CodegenColumnDO> columns = getColumnList("student");
+        // 准备参数（子表）
+        CodegenTableDO contactTable = getTable("contact")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
+                .setFrontType(CodegenFrontTypeEnum.VUE2.getType())
+                .setSubJoinColumnId(100L).setSubJoinMany(true);
+        List<CodegenColumnDO> contactColumns = getColumnList("contact");
+        // 准备参数（班主任）
+        CodegenTableDO teacherTable = getTable("teacher")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
+                .setFrontType(CodegenFrontTypeEnum.VUE2.getType())
+                .setSubJoinColumnId(200L).setSubJoinMany(false);
+        List<CodegenColumnDO> teacherColumns = getColumnList("teacher");
+
+        // 调用
+        Map<String, String> result = codegenEngine.execute(table, columns,
+                Arrays.asList(contactTable, teacherTable), Arrays.asList(contactColumns, teacherColumns));
+        // 断言
+        assertResult(result, path);
+//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/" + path);
+//        writeFile(result, "/Users/yunai/test/demo11.zip");
+    }
+
+    private static CodegenTableDO getTable(String name) {
+        String content = ResourceUtil.readUtf8Str("codegen/table/" + name + ".json");
+        return JsonUtils.parseObject(content, "table", CodegenTableDO.class);
+    }
+
+    private static List<CodegenColumnDO> getColumnList(String name) {
+        String content = ResourceUtil.readUtf8Str("codegen/table/" + name + ".json");
+        List<CodegenColumnDO> list = JsonUtils.parseArray(content, "columns", CodegenColumnDO.class);
+        list.forEach(column -> {
+            if (column.getNullable() == null) {
+                column.setNullable(false);
+            }
+            if (column.getCreateOperation() == null) {
+                column.setCreateOperation(false);
+            }
+            if (column.getUpdateOperation() == null) {
+                column.setUpdateOperation(false);
+            }
+            if (column.getListOperation() == null) {
+                column.setListOperation(false);
+            }
+            if (column.getListOperationResult() == null) {
+                column.setListOperationResult(false);
+            }
+        });
+        return list;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static void assertResult(Map<String, String> result, String path) {
+        String assertContent = ResourceUtil.readUtf8Str(path + "/assert.json");
+        List<HashMap> asserts = JsonUtils.parseArray(assertContent, HashMap.class);
+        assertEquals(asserts.size(), result.size());
+        // 校验每个文件
+        asserts.forEach(assertMap -> {
+            String contentPath = (String) assertMap.get("contentPath");
+            String filePath = (String) assertMap.get("filePath");
+            String content = ResourceUtil.readUtf8Str(path + "/" + contentPath);
+            assertEquals(content, result.get(filePath), filePath + "：不匹配");
+        });
+    }
+
+    // ==================== 调试专用 ====================
+
+    /**
+     * 【调试使用】将生成的代码，写入到文件
+     *
+     * @param result 生成的代码
+     * @param path 写入文件的路径
+     */
+    private void writeFile(Map<String, String> result, String path) {
+        // 生成压缩包
+        String[] paths = result.keySet().toArray(new String[0]);
+        ByteArrayInputStream[] ins = result.values().stream().map(IoUtil::toUtf8Stream).toArray(ByteArrayInputStream[]::new);
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipUtil.zip(outputStream, paths, ins);
+        // 写入文件
+        FileUtil.writeBytes(outputStream.toByteArray(), path);
+    }
+
+    /**
+     * 【调试使用】将生成的结果，写入到文件
+     *
+     * @param result 生成的代码
+     * @param basePath 写入文件的路径（绝对路径）
+     */
+    private void writeResult(Map<String, String> result, String basePath) {
+        // 写入文件内容
+        List<Map<String, String>> asserts = new ArrayList<>();
+        result.forEach((filePath, fileContent) -> {
+            String lastFilePath = StrUtil.subAfter(filePath, '/', true);
+            String contentPath = StrUtil.subAfter(lastFilePath, '.', true)
+                    + '/' + StrUtil.subBefore(lastFilePath, '.', true);
+            asserts.add(MapUtil.<String, String>builder().put("filePath", filePath)
+                    .put("contentPath", contentPath).build());
+            FileUtil.writeUtf8String(fileContent, basePath + "/" + contentPath);
+        });
+        // 写入 assert.json 文件
+        FileUtil.writeUtf8String(JsonUtils.toJsonPrettyString(asserts), basePath +"/assert.json");
+    }
+
+}

From c50d27f5cbb43713c455a15ce12ea15442395c4b Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 21 Nov 2023 11:58:04 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20vue2=20=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=EF=BC=8C=E9=80=82=E9=85=8D=E6=A0=91=E8=A1=A8=E5=92=8C=E4=B8=BB?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/codegen/vue/api/api.js.vm  |  2 +-
 .../vue/views/components/form_sub_erp.vue.vm  |  5 +++--
 .../views/components/form_sub_normal.vue.vm   |  2 ++
 .../vue/views/components/list_sub_erp.vue.vm  | 14 +++++++++---
 .../resources/codegen/vue/views/form.vue.vm   | 22 +++++++++----------
 .../resources/codegen/vue/views/index.vue.vm  | 21 +++++++++++++-----
 6 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm
index fdafffd54..906d12c29 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm
@@ -79,7 +79,7 @@ export function export${simpleClassName}Excel(params) {
   #if ( $table.templateType == 11 )
 
   // 获得${subTable.classComment}分页
-  export function get${simpleClassName}Page(params) {
+  export function get${subSimpleClassName}Page(params) {
     return request({
       url: '${baseURL}/${subSimpleClassName_strikeCase}/page',
       method: 'get',
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
index eb7c45b3b..e44b16bb7 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
@@ -1,3 +1,4 @@
+#set ($subTable = $subTables.get($subIndex))##当前表
 #set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组
 #set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
 #set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
@@ -155,13 +156,13 @@
           try {
               ${simpleClassName}Api.get${subSimpleClassName}(id).then(res=>{
               that.formData = res.data;
-              that.dialogTitle = "修改${table.classComment}";
+              that.dialogTitle = "修改${subTable.classComment}";
             })
           } finally {
             this.formLoading = false;
           }
         }
-        this.dialogTitle = "新增${table.classComment}";
+        this.dialogTitle = "新增${subTable.classComment}";
       },
       /** 提交按钮 */
       submitForm() {
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
index ae6cf7b63..c450fecb0 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
@@ -5,6 +5,7 @@
 #set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
 #set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
 <template>
+  <div class="app-container">
     #if ( $subTable.subJoinMany )## 情况一：一对多，table + form
       <el-form
           ref="formRef"
@@ -216,6 +217,7 @@
           #end
       </el-form>
     #end
+  </div>
 </template>
 
 <script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
index 7f7f29974..63fb41381 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
@@ -1,3 +1,9 @@
+#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 ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
 <template>
   <div class="app-container">
 #if ($table.templateType == 11)
@@ -95,8 +101,10 @@
     watch:{/** 监听主表的关联字段的变化，加载对应的子表数据 */
         ${subJoinColumn.javaField}:{
             handler(val) {
-              this.queryParams.${subJoinColumn.javaField} = val
-              this.handleQuery()
+              this.queryParams.${subJoinColumn.javaField} = val;
+              if (val){
+                this.handleQuery();
+              }
             },
             immediate: true
       }
@@ -158,7 +166,7 @@
           }).catch(() => {});
         } catch {}
       },
-    }
 #end
+    }
   };
 </script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
index 0e61203d6..d6c050719 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
@@ -214,7 +214,7 @@
         this.title = "新增${table.classComment}";
         ## 特殊：树表专属逻辑
         #if ( $table.templateType == 2 )
-            this.get${simpleClassName}Tree()
+            this.get${simpleClassName}Tree();
         #end
       },
       /** 提交按钮 */
@@ -241,7 +241,7 @@
                 data.${subClassNameVar}#if ( $subTable.subJoinMany)s#end = that.getRef('${subClassNameVar}FormRef').getData();
               #end
             }).catch((err) => {
-                validate = false
+                validate = false;
                 that.subTabsName = err.replace("FormRef", ""); // 定位到没有校验通过的子表单
             })
         #end
@@ -266,11 +266,11 @@
             that.#[[$]]#emit('success');
           });
         }finally {
-          this.formLoading = false
+          this.formLoading = false;
         }
       },
-      getRef(refName){ // TODO puhui999: 获得表单 ref，提取出来的目的呢是解决 #[[$]]# 在 if 中 end闭合不了的问题，代码生成后可删除此方法
-        return this.#[[$]]#refs[refName]
+      getRef(refName){
+        return this.#[[$]]#refs[refName];
       },
 ## 特殊：主子表专属逻辑
 #if ( $table.templateType == 10 || $table.templateType == 12 )
@@ -278,12 +278,12 @@
       /** 校验子表单 */
       validateSubFrom(item) {
         return new Promise((resolve, reject) => {
-          this.$refs[item].validate()
+          this.getRef(item).validate()
           .then(() => {
-            resolve()
+            resolve();
           })
           .catch(() => {
-            reject(item)
+            reject(item);
           })
         })
       },
@@ -299,14 +299,14 @@
         ];
         const validArr = []; // 校验
         for (const item of validFormRefArr) {
-          validArr.push(this.validateSubFrom(item))
+          validArr.push(this.validateSubFrom(item));
         }
         return new Promise((resolve, reject) => {
           // 校验所有
           Promise.all(validArr).then(() => {
-            resolve()
+            resolve();
           }).catch((err) => {
-            reject(err)
+            reject(err);
           })
         })
       },
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
index 33ec21596..2150cbf76 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
@@ -152,14 +152,14 @@
   ## 特殊：主子表专属逻辑
   #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
     <!-- 子表的列表 -->
-      <el-tabs model-value="$subClassNameVars.get(0)">
+      <el-tabs v-model="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))
             <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
-              <${subSimpleClassName}List :${subJoinColumn_strikeCase}="currentRow.id" />
+              <${subSimpleClassName}List v-if="currentRow.id" :${subJoinColumn_strikeCase}="currentRow.id" />
             </el-tab-pane>
           #end
       </el-tabs>
@@ -247,7 +247,14 @@ export default {
         #end
         #end
         #end
-      }
+      },
+        ## 特殊：主子表专属逻辑-erp
+        #if ( $table.templateType == 11)
+            #if ( $subTables && $subTables.size() > 0 )
+              /** 子表的列表 */
+              subTabsName: '$subClassNameVars.get(0)'
+            #end
+        #end
     };
   },
   created() {
@@ -285,7 +292,7 @@ export default {
     },
     /** 添加/修改操作 */
     openForm(id) {
-      this.#[[$]]#refs["formRef"].open(id)
+      this.#[[$]]#refs["formRef"].open(id);
     },
     /** 删除按钮操作 */
     handleDelete(row) {
@@ -319,7 +326,11 @@ export default {
       #if ( $table.templateType == 11 )
         /** 选中行操作 */
         handleCurrentChange(row) {
-         this.currentRow = row
+         this.currentRow = row;
+        #if ( $subTables && $subTables.size() > 0 )
+          /** 子表的列表 */
+          this.subTabsName = '$subClassNameVars.get(0)';
+        #end
         },
       #end
       ## 特殊：树表专属逻辑

From 3d2022e31fb3490af69c3802f4be6c5bff288a7e Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 21 Nov 2023 16:22:16 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20vue2=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codegen/vue2_master_erp/assert.json       |  73 ++++++
 .../java/ErrorCodeConstants_手动操作          |   6 +
 .../java/InfraStudentContactDO                |  71 ++++++
 .../java/InfraStudentContactMapper            |  30 +++
 .../java/InfraStudentController               | 183 +++++++++++++
 .../vue2_master_erp/java/InfraStudentDO       |  67 +++++
 .../vue2_master_erp/java/InfraStudentMapper   |  30 +++
 .../java/InfraStudentPageReqVO                |  34 +++
 .../vue2_master_erp/java/InfraStudentRespVO   |  60 +++++
 .../java/InfraStudentSaveReqVO                |  52 ++++
 .../vue2_master_erp/java/InfraStudentService  | 139 ++++++++++
 .../java/InfraStudentServiceImpl              | 180 +++++++++++++
 .../java/InfraStudentServiceImplTest          | 146 +++++++++++
 .../java/InfraStudentTeacherDO                |  71 ++++++
 .../java/InfraStudentTeacherMapper            |  30 +++
 .../codegen/vue2_master_erp/js/student        | 141 ++++++++++
 .../resources/codegen/vue2_master_erp/sql/h2  |  17 ++
 .../resources/codegen/vue2_master_erp/sql/sql |  55 ++++
 .../vue2_master_erp/vue/StudentContactForm    | 159 ++++++++++++
 .../vue2_master_erp/vue/StudentContactList    | 134 ++++++++++
 .../codegen/vue2_master_erp/vue/StudentForm   | 164 ++++++++++++
 .../vue2_master_erp/vue/StudentTeacherForm    | 159 ++++++++++++
 .../vue2_master_erp/vue/StudentTeacherList    | 134 ++++++++++
 .../codegen/vue2_master_erp/vue/index         | 241 ++++++++++++++++++
 .../vue2_master_erp/xml/InfraStudentMapper    |  12 +
 .../codegen/vue2_master_inner/assert.json     |  73 ++++++
 .../java/ErrorCodeConstants_手动操作          |   3 +
 .../java/InfraStudentContactDO                |  71 ++++++
 .../java/InfraStudentContactMapper            |  28 ++
 .../java/InfraStudentController               | 117 +++++++++
 .../vue2_master_inner/java/InfraStudentDO     |  67 +++++
 .../vue2_master_inner/java/InfraStudentMapper |  30 +++
 .../java/InfraStudentPageReqVO                |  34 +++
 .../vue2_master_inner/java/InfraStudentRespVO |  60 +++++
 .../java/InfraStudentSaveReqVO                |  58 +++++
 .../java/InfraStudentService                  |  77 ++++++
 .../java/InfraStudentServiceImpl              | 147 +++++++++++
 .../java/InfraStudentServiceImplTest          | 146 +++++++++++
 .../java/InfraStudentTeacherDO                |  71 ++++++
 .../java/InfraStudentTeacherMapper            |  28 ++
 .../codegen/vue2_master_inner/js/student      |  74 ++++++
 .../codegen/vue2_master_inner/sql/h2          |  17 ++
 .../codegen/vue2_master_inner/sql/sql         |  55 ++++
 .../vue2_master_inner/vue/StudentContactForm  | 176 +++++++++++++
 .../vue2_master_inner/vue/StudentContactList  |  91 +++++++
 .../codegen/vue2_master_inner/vue/StudentForm | 221 ++++++++++++++++
 .../vue2_master_inner/vue/StudentTeacherForm  | 126 +++++++++
 .../vue2_master_inner/vue/StudentTeacherList  |  95 +++++++
 .../codegen/vue2_master_inner/vue/index       | 230 +++++++++++++++++
 .../vue2_master_inner/xml/InfraStudentMapper  |  12 +
 .../codegen/vue2_master_normal/assert.json    |  67 +++++
 .../java/ErrorCodeConstants_手动操作          |   3 +
 .../java/InfraStudentContactDO                |  71 ++++++
 .../java/InfraStudentContactMapper            |  28 ++
 .../java/InfraStudentController               | 117 +++++++++
 .../vue2_master_normal/java/InfraStudentDO    |  67 +++++
 .../java/InfraStudentMapper                   |  30 +++
 .../java/InfraStudentPageReqVO                |  34 +++
 .../java/InfraStudentRespVO                   |  60 +++++
 .../java/InfraStudentSaveReqVO                |  58 +++++
 .../java/InfraStudentService                  |  77 ++++++
 .../java/InfraStudentServiceImpl              | 147 +++++++++++
 .../java/InfraStudentServiceImplTest          | 146 +++++++++++
 .../java/InfraStudentTeacherDO                |  71 ++++++
 .../java/InfraStudentTeacherMapper            |  28 ++
 .../codegen/vue2_master_normal/js/student     |  74 ++++++
 .../codegen/vue2_master_normal/sql/h2         |  17 ++
 .../codegen/vue2_master_normal/sql/sql        |  55 ++++
 .../vue2_master_normal/vue/StudentContactForm | 176 +++++++++++++
 .../vue2_master_normal/vue/StudentForm        | 221 ++++++++++++++++
 .../vue2_master_normal/vue/StudentTeacherForm | 126 +++++++++
 .../codegen/vue2_master_normal/vue/index      | 213 ++++++++++++++++
 .../vue2_master_normal/xml/InfraStudentMapper |  12 +
 .../resources/codegen/vue2_one/assert.json    |  49 ++++
 .../vue2_one/java/ErrorCodeConstants_手动操作 |   3 +
 .../vue2_one/java/InfraStudentController      |  95 +++++++
 .../codegen/vue2_one/java/InfraStudentDO      |  67 +++++
 .../codegen/vue2_one/java/InfraStudentMapper  |  30 +++
 .../vue2_one/java/InfraStudentPageReqVO       |  34 +++
 .../codegen/vue2_one/java/InfraStudentRespVO  |  60 +++++
 .../vue2_one/java/InfraStudentSaveReqVO       |  50 ++++
 .../codegen/vue2_one/java/InfraStudentService |  55 ++++
 .../vue2_one/java/InfraStudentServiceImpl     |  74 ++++++
 .../vue2_one/java/InfraStudentServiceImplTest | 146 +++++++++++
 .../resources/codegen/vue2_one/js/student     |  53 ++++
 .../test/resources/codegen/vue2_one/sql/h2    |  17 ++
 .../test/resources/codegen/vue2_one/sql/sql   |  55 ++++
 .../codegen/vue2_one/vue/StudentForm          | 164 ++++++++++++
 .../test/resources/codegen/vue2_one/vue/index | 213 ++++++++++++++++
 .../codegen/vue2_one/xml/InfraStudentMapper   |  12 +
 .../resources/codegen/vue2_tree/assert.json   |  49 ++++
 .../java/ErrorCodeConstants_手动操作          |   8 +
 .../vue2_tree/java/InfraCategoryController    |  94 +++++++
 .../codegen/vue2_tree/java/InfraCategoryDO    |  39 +++
 .../vue2_tree/java/InfraCategoryListReqVO     |  15 ++
 .../vue2_tree/java/InfraCategoryMapper        |  34 +++
 .../vue2_tree/java/InfraCategoryRespVO        |  26 ++
 .../vue2_tree/java/InfraCategorySaveReqVO     |  24 ++
 .../vue2_tree/java/InfraCategoryService       |  55 ++++
 .../vue2_tree/java/InfraCategoryServiceImpl   | 136 ++++++++++
 .../java/InfraCategoryServiceImplTest         | 129 ++++++++++
 .../resources/codegen/vue2_tree/js/category   |  53 ++++
 .../test/resources/codegen/vue2_tree/sql/h2   |  10 +
 .../test/resources/codegen/vue2_tree/sql/sql  |  55 ++++
 .../codegen/vue2_tree/vue/CategoryForm        | 147 +++++++++++
 .../resources/codegen/vue2_tree/vue/index     | 169 ++++++++++++
 .../codegen/vue2_tree/xml/InfraCategoryMapper |  12 +
 107 files changed, 8625 insertions(+)
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/assert.json
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/ErrorCodeConstants_手动操作
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactDO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentController
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentDO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentPageReqVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentRespVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentSaveReqVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentService
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImpl
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImplTest
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherDO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/js/student
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/h2
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/sql
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactForm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactList
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentForm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherForm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherList
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/index
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/xml/InfraStudentMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/assert.json
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/ErrorCodeConstants_手动操作
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactDO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentController
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentDO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentPageReqVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentRespVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentSaveReqVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentService
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImplTest
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherDO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/js/student
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/h2
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/sql
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactForm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactList
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentForm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherForm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherList
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/index
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/xml/InfraStudentMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/assert.json
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/ErrorCodeConstants_手动操作
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactDO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentController
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentDO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentPageReqVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentRespVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentSaveReqVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentService
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImplTest
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherDO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/js/student
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/h2
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/sql
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentContactForm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentForm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentTeacherForm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/index
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/xml/InfraStudentMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/assert.json
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/ErrorCodeConstants_手动操作
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentController
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentDO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentPageReqVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentRespVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentSaveReqVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentService
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImpl
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImplTest
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/js/student
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/h2
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/sql
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/StudentForm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/index
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/xml/InfraStudentMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/assert.json
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/ErrorCodeConstants_手动操作
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryController
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryDO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryListReqVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryMapper
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryRespVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategorySaveReqVO
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryService
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImpl
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImplTest
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/js/category
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/h2
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/sql
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/CategoryForm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/index
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/xml/InfraCategoryMapper

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/assert.json
new file mode 100644
index 000000000..f95ae9af1
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/assert.json
@@ -0,0 +1,73 @@
+[ {
+  "contentPath" : "java/InfraStudentPageReqVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentPageReqVO.java"
+}, {
+  "contentPath" : "java/InfraStudentRespVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentRespVO.java"
+}, {
+  "contentPath" : "java/InfraStudentSaveReqVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentSaveReqVO.java"
+}, {
+  "contentPath" : "java/InfraStudentController",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/InfraStudentController.java"
+}, {
+  "contentPath" : "java/InfraStudentDO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentDO.java"
+}, {
+  "contentPath" : "java/InfraStudentContactDO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentContactDO.java"
+}, {
+  "contentPath" : "java/InfraStudentTeacherDO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentTeacherDO.java"
+}, {
+  "contentPath" : "java/InfraStudentMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentMapper.java"
+}, {
+  "contentPath" : "java/InfraStudentContactMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentContactMapper.java"
+}, {
+  "contentPath" : "java/InfraStudentTeacherMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentTeacherMapper.java"
+}, {
+  "contentPath" : "xml/InfraStudentMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/demo/InfraStudentMapper.xml"
+}, {
+  "contentPath" : "java/InfraStudentServiceImpl",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentServiceImpl.java"
+}, {
+  "contentPath" : "java/InfraStudentService",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentService.java"
+}, {
+  "contentPath" : "java/InfraStudentServiceImplTest",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentServiceImplTest.java"
+}, {
+  "contentPath" : "java/ErrorCodeConstants_手动操作",
+  "filePath" : "yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants_手动操作.java"
+}, {
+  "contentPath" : "sql/sql",
+  "filePath" : "sql/sql.sql"
+}, {
+  "contentPath" : "sql/h2",
+  "filePath" : "sql/h2.sql"
+}, {
+  "contentPath" : "vue/index",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue"
+}, {
+  "contentPath" : "js/student",
+  "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js"
+}, {
+  "contentPath" : "vue/StudentForm",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue"
+}, {
+  "contentPath" : "vue/StudentContactForm",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/components/StudentContactForm.vue"
+}, {
+  "contentPath" : "vue/StudentTeacherForm",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/components/StudentTeacherForm.vue"
+}, {
+  "contentPath" : "vue/StudentContactList",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/components/StudentContactList.vue"
+}, {
+  "contentPath" : "vue/StudentTeacherList",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/components/StudentTeacherList.vue"
+} ]
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/ErrorCodeConstants_手动操作
new file mode 100644
index 000000000..d3201dec3
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/ErrorCodeConstants_手动操作
@@ -0,0 +1,6 @@
+// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！
+// ========== 学生 TODO 补充编号 ==========
+ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在");
+ErrorCode STUDENT_CONTACT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生联系人不存在");
+ErrorCode STUDENT_TEACHER_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生班主任不存在");
+ErrorCode STUDENT_TEACHER_EXISTS = new ErrorCode(TODO 补充编号, "学生班主任已存在");
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactDO
new file mode 100644
index 000000000..17c668eaa
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactDO
@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.infra.dal.dataobject.demo;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 学生联系人 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("infra_student_contact")
+@KeySequence("infra_student_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfraStudentContactDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 学生编号
+     */
+    private Long studentId;
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 简介
+     */
+    private String description;
+    /**
+     * 出生日期
+     */
+    private LocalDateTime birthday;
+    /**
+     * 性别
+     *
+     * 枚举 {@link TODO system_user_sex 对应的类}
+     */
+    private Integer sex;
+    /**
+     * 是否有效
+     *
+     * 枚举 {@link TODO infra_boolean_string 对应的类}
+     */
+    private Boolean enabled;
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 附件
+     */
+    private String video;
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactMapper
new file mode 100644
index 000000000..ca662d19c
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactMapper
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.infra.dal.mysql.demo;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 学生联系人 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfraStudentContactMapper extends BaseMapperX<InfraStudentContactDO> {
+
+    default PageResult<InfraStudentContactDO> selectPage(PageParam reqVO, Long studentId) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<InfraStudentContactDO>()
+            .eq(InfraStudentContactDO::getStudentId, studentId)
+            .orderByDesc(InfraStudentContactDO::getId));
+    }
+
+    default int deleteByStudentId(Long studentId) {
+        return delete(InfraStudentContactDO::getStudentId, studentId);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentController
new file mode 100644
index 000000000..d6f20183d
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentController
@@ -0,0 +1,183 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import cn.iocoder.yudao.module.infra.service.demo.InfraStudentService;
+
+@Tag(name = "管理后台 - 学生")
+@RestController
+@RequestMapping("/infra/student")
+@Validated
+public class InfraStudentController {
+
+    @Resource
+    private InfraStudentService studentService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建学生")
+    @PreAuthorize("@ss.hasPermission('infra:student:create')")
+    public CommonResult<Long> createStudent(@Valid @RequestBody InfraStudentSaveReqVO createReqVO) {
+        return success(studentService.createStudent(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新学生")
+    @PreAuthorize("@ss.hasPermission('infra:student:update')")
+    public CommonResult<Boolean> updateStudent(@Valid @RequestBody InfraStudentSaveReqVO updateReqVO) {
+        studentService.updateStudent(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除学生")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('infra:student:delete')")
+    public CommonResult<Boolean> deleteStudent(@RequestParam("id") Long id) {
+        studentService.deleteStudent(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得学生")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<InfraStudentRespVO> getStudent(@RequestParam("id") Long id) {
+        InfraStudentDO student = studentService.getStudent(id);
+        return success(BeanUtils.toBean(student, InfraStudentRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得学生分页")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<PageResult<InfraStudentRespVO>> getStudentPage(@Valid InfraStudentPageReqVO pageReqVO) {
+        PageResult<InfraStudentDO> pageResult = studentService.getStudentPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, InfraStudentRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出学生 Excel")
+    @PreAuthorize("@ss.hasPermission('infra:student:export')")
+    @OperateLog(type = EXPORT)
+    public void exportStudentExcel(@Valid InfraStudentPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<InfraStudentDO> list = studentService.getStudentPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "学生.xls", "数据", InfraStudentRespVO.class,
+                        BeanUtils.toBean(list, InfraStudentRespVO.class));
+    }
+
+    // ==================== 子表（学生联系人） ====================
+
+    @GetMapping("/student-contact/page")
+    @Operation(summary = "获得学生联系人分页")
+    @Parameter(name = "studentId", description = "学生编号")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<PageResult<InfraStudentContactDO>> getStudentContactPage(PageParam pageReqVO,
+                                                                                        @RequestParam("studentId") Long studentId) {
+        return success(studentService.getStudentContactPage(pageReqVO, studentId));
+    }
+
+    @PostMapping("/student-contact/create")
+    @Operation(summary = "创建学生联系人")
+    @PreAuthorize("@ss.hasPermission('infra:student:create')")
+    public CommonResult<Long> createStudentContact(@Valid @RequestBody InfraStudentContactDO studentContact) {
+        return success(studentService.createStudentContact(studentContact));
+    }
+
+    @PutMapping("/student-contact/update")
+    @Operation(summary = "更新学生联系人")
+    @PreAuthorize("@ss.hasPermission('infra:student:update')")
+    public CommonResult<Boolean> updateStudentContact(@Valid @RequestBody InfraStudentContactDO studentContact) {
+        studentService.updateStudentContact(studentContact);
+        return success(true);
+    }
+
+    @DeleteMapping("/student-contact/delete")
+    @Parameter(name = "id", description = "编号", required = true)
+    @Operation(summary = "删除学生联系人")
+    @PreAuthorize("@ss.hasPermission('infra:student:delete')")
+    public CommonResult<Boolean> deleteStudentContact(@RequestParam("id") Long id) {
+        studentService.deleteStudentContact(id);
+        return success(true);
+    }
+
+	@GetMapping("/student-contact/get")
+	@Operation(summary = "获得学生联系人")
+	@Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+	public CommonResult<InfraStudentContactDO> getStudentContact(@RequestParam("id") Long id) {
+	    return success(studentService.getStudentContact(id));
+	}
+
+    // ==================== 子表（学生班主任） ====================
+
+    @GetMapping("/student-teacher/page")
+    @Operation(summary = "获得学生班主任分页")
+    @Parameter(name = "studentId", description = "学生编号")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<PageResult<InfraStudentTeacherDO>> getStudentTeacherPage(PageParam pageReqVO,
+                                                                                        @RequestParam("studentId") Long studentId) {
+        return success(studentService.getStudentTeacherPage(pageReqVO, studentId));
+    }
+
+    @PostMapping("/student-teacher/create")
+    @Operation(summary = "创建学生班主任")
+    @PreAuthorize("@ss.hasPermission('infra:student:create')")
+    public CommonResult<Long> createStudentTeacher(@Valid @RequestBody InfraStudentTeacherDO studentTeacher) {
+        return success(studentService.createStudentTeacher(studentTeacher));
+    }
+
+    @PutMapping("/student-teacher/update")
+    @Operation(summary = "更新学生班主任")
+    @PreAuthorize("@ss.hasPermission('infra:student:update')")
+    public CommonResult<Boolean> updateStudentTeacher(@Valid @RequestBody InfraStudentTeacherDO studentTeacher) {
+        studentService.updateStudentTeacher(studentTeacher);
+        return success(true);
+    }
+
+    @DeleteMapping("/student-teacher/delete")
+    @Parameter(name = "id", description = "编号", required = true)
+    @Operation(summary = "删除学生班主任")
+    @PreAuthorize("@ss.hasPermission('infra:student:delete')")
+    public CommonResult<Boolean> deleteStudentTeacher(@RequestParam("id") Long id) {
+        studentService.deleteStudentTeacher(id);
+        return success(true);
+    }
+
+	@GetMapping("/student-teacher/get")
+	@Operation(summary = "获得学生班主任")
+	@Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+	public CommonResult<InfraStudentTeacherDO> getStudentTeacher(@RequestParam("id") Long id) {
+	    return success(studentService.getStudentTeacher(id));
+	}
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentDO
new file mode 100644
index 000000000..b0d4bd216
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentDO
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.infra.dal.dataobject.demo;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 学生 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("infra_student")
+@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfraStudentDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 简介
+     */
+    private String description;
+    /**
+     * 出生日期
+     */
+    private LocalDateTime birthday;
+    /**
+     * 性别
+     *
+     * 枚举 {@link TODO system_user_sex 对应的类}
+     */
+    private Integer sex;
+    /**
+     * 是否有效
+     *
+     * 枚举 {@link TODO infra_boolean_string 对应的类}
+     */
+    private Boolean enabled;
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 附件
+     */
+    private String video;
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentMapper
new file mode 100644
index 000000000..34e70a082
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentMapper
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.infra.dal.mysql.demo;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+
+/**
+ * 学生 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfraStudentMapper extends BaseMapperX<InfraStudentDO> {
+
+    default PageResult<InfraStudentDO> selectPage(InfraStudentPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<InfraStudentDO>()
+                .likeIfPresent(InfraStudentDO::getName, reqVO.getName())
+                .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday())
+                .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex())
+                .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled())
+                .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(InfraStudentDO::getId));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentPageReqVO
new file mode 100644
index 000000000..41a373012
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentPageReqVO
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 学生分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class InfraStudentPageReqVO extends PageParam {
+
+    @Schema(description = "名字", example = "芋头")
+    private String name;
+
+    @Schema(description = "出生日期")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", example = "1")
+    private Integer sex;
+
+    @Schema(description = "是否有效", example = "true")
+    private Boolean enabled;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentRespVO
new file mode 100644
index 000000000..c41a5501f
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentRespVO
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 学生 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class InfraStudentRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @ExcelProperty("编号")
+    private Long id;
+
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋头")
+    @ExcelProperty("名字")
+    private String name;
+
+    @Schema(description = "简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是介绍")
+    @ExcelProperty("简介")
+    private String description;
+
+    @Schema(description = "出生日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("出生日期")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty(value = "性别", converter = DictConvert.class)
+    @DictFormat("system_user_sex") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer sex;
+
+    @Schema(description = "是否有效", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @ExcelProperty(value = "是否有效", converter = DictConvert.class)
+    @DictFormat("infra_boolean_string") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Boolean enabled;
+
+    @Schema(description = "头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png")
+    @ExcelProperty("头像")
+    private String avatar;
+
+    @Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.mp4")
+    @ExcelProperty("附件")
+    private String video;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是备注")
+    @ExcelProperty("备注")
+    private String memo;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentSaveReqVO
new file mode 100644
index 000000000..eaadf7432
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentSaveReqVO
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+
+@Schema(description = "管理后台 - 学生新增/修改 Request VO")
+@Data
+public class InfraStudentSaveReqVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋头")
+    @NotEmpty(message = "名字不能为空")
+    private String name;
+
+    @Schema(description = "简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是介绍")
+    @NotEmpty(message = "简介不能为空")
+    private String description;
+
+    @Schema(description = "出生日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "出生日期不能为空")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "性别不能为空")
+    private Integer sex;
+
+    @Schema(description = "是否有效", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @NotNull(message = "是否有效不能为空")
+    private Boolean enabled;
+
+    @Schema(description = "头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png")
+    @NotEmpty(message = "头像不能为空")
+    private String avatar;
+
+    @Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.mp4")
+    @NotEmpty(message = "附件不能为空")
+    private String video;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是备注")
+    @NotEmpty(message = "备注不能为空")
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentService
new file mode 100644
index 000000000..7df090d7f
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentService
@@ -0,0 +1,139 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+/**
+ * 学生 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface InfraStudentService {
+
+    /**
+     * 创建学生
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createStudent(@Valid InfraStudentSaveReqVO createReqVO);
+
+    /**
+     * 更新学生
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateStudent(@Valid InfraStudentSaveReqVO updateReqVO);
+
+    /**
+     * 删除学生
+     *
+     * @param id 编号
+     */
+    void deleteStudent(Long id);
+
+    /**
+     * 获得学生
+     *
+     * @param id 编号
+     * @return 学生
+     */
+    InfraStudentDO getStudent(Long id);
+
+    /**
+     * 获得学生分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 学生分页
+     */
+    PageResult<InfraStudentDO> getStudentPage(InfraStudentPageReqVO pageReqVO);
+
+    // ==================== 子表（学生联系人） ====================
+
+    /**
+     * 获得学生联系人分页
+     *
+     * @param pageReqVO 分页查询
+     * @param studentId 学生编号
+     * @return 学生联系人分页
+     */
+    PageResult<InfraStudentContactDO> getStudentContactPage(PageParam pageReqVO, Long studentId);
+
+    /**
+     * 创建学生联系人
+     *
+     * @param studentContact 创建信息
+     * @return 编号
+     */
+    Long createStudentContact(@Valid InfraStudentContactDO studentContact);
+
+    /**
+     * 更新学生联系人
+     *
+     * @param studentContact 更新信息
+     */
+    void updateStudentContact(@Valid InfraStudentContactDO studentContact);
+
+    /**
+     * 删除学生联系人
+     *
+     * @param id 编号
+     */
+    void deleteStudentContact(Long id);
+
+	/**
+	 * 获得学生联系人
+	 *
+	 * @param id 编号
+     * @return 学生联系人
+	 */
+    InfraStudentContactDO getStudentContact(Long id);
+
+    // ==================== 子表（学生班主任） ====================
+
+    /**
+     * 获得学生班主任分页
+     *
+     * @param pageReqVO 分页查询
+     * @param studentId 学生编号
+     * @return 学生班主任分页
+     */
+    PageResult<InfraStudentTeacherDO> getStudentTeacherPage(PageParam pageReqVO, Long studentId);
+
+    /**
+     * 创建学生班主任
+     *
+     * @param studentTeacher 创建信息
+     * @return 编号
+     */
+    Long createStudentTeacher(@Valid InfraStudentTeacherDO studentTeacher);
+
+    /**
+     * 更新学生班主任
+     *
+     * @param studentTeacher 更新信息
+     */
+    void updateStudentTeacher(@Valid InfraStudentTeacherDO studentTeacher);
+
+    /**
+     * 删除学生班主任
+     *
+     * @param id 编号
+     */
+    void deleteStudentTeacher(Long id);
+
+	/**
+	 * 获得学生班主任
+	 *
+	 * @param id 编号
+     * @return 学生班主任
+	 */
+    InfraStudentTeacherDO getStudentTeacher(Long id);
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImpl
new file mode 100644
index 000000000..793b2dd22
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImpl
@@ -0,0 +1,180 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper;
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentContactMapper;
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentTeacherMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
+
+/**
+ * 学生 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class InfraStudentServiceImpl implements InfraStudentService {
+
+    @Resource
+    private InfraStudentMapper studentMapper;
+    @Resource
+    private InfraStudentContactMapper studentContactMapper;
+    @Resource
+    private InfraStudentTeacherMapper studentTeacherMapper;
+
+    @Override
+    public Long createStudent(InfraStudentSaveReqVO createReqVO) {
+        // 插入
+        InfraStudentDO student = BeanUtils.toBean(createReqVO, InfraStudentDO.class);
+        studentMapper.insert(student);
+        // 返回
+        return student.getId();
+    }
+
+    @Override
+    public void updateStudent(InfraStudentSaveReqVO updateReqVO) {
+        // 校验存在
+        validateStudentExists(updateReqVO.getId());
+        // 更新
+        InfraStudentDO updateObj = BeanUtils.toBean(updateReqVO, InfraStudentDO.class);
+        studentMapper.updateById(updateObj);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteStudent(Long id) {
+        // 校验存在
+        validateStudentExists(id);
+        // 删除
+        studentMapper.deleteById(id);
+
+        // 删除子表
+        deleteStudentContactByStudentId(id);
+        deleteStudentTeacherByStudentId(id);
+    }
+
+    private void validateStudentExists(Long id) {
+        if (studentMapper.selectById(id) == null) {
+            throw exception(STUDENT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public InfraStudentDO getStudent(Long id) {
+        return studentMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<InfraStudentDO> getStudentPage(InfraStudentPageReqVO pageReqVO) {
+        return studentMapper.selectPage(pageReqVO);
+    }
+
+    // ==================== 子表（学生联系人） ====================
+
+    @Override
+    public PageResult<InfraStudentContactDO> getStudentContactPage(PageParam pageReqVO, Long studentId) {
+        return studentContactMapper.selectPage(pageReqVO, studentId);
+    }
+
+    @Override
+    public Long createStudentContact(InfraStudentContactDO studentContact) {
+        studentContactMapper.insert(studentContact);
+        return studentContact.getId();
+    }
+
+    @Override
+    public void updateStudentContact(InfraStudentContactDO studentContact) {
+        // 校验存在
+        validateStudentContactExists(studentContact.getId());
+        // 更新
+        studentContactMapper.updateById(studentContact);
+    }
+
+    @Override
+    public void deleteStudentContact(Long id) {
+        // 校验存在
+        validateStudentContactExists(id);
+        // 删除
+        studentContactMapper.deleteById(id);
+    }
+
+    @Override
+    public InfraStudentContactDO getStudentContact(Long id) {
+        return studentContactMapper.selectById(id);
+    }
+
+    private void validateStudentContactExists(Long id) {
+        if (studentContactMapper.selectById(id) == null) {
+            throw exception(STUDENT_CONTACT_NOT_EXISTS);
+        }
+    }
+
+    private void deleteStudentContactByStudentId(Long studentId) {
+        studentContactMapper.deleteByStudentId(studentId);
+    }
+
+    // ==================== 子表（学生班主任） ====================
+
+    @Override
+    public PageResult<InfraStudentTeacherDO> getStudentTeacherPage(PageParam pageReqVO, Long studentId) {
+        return studentTeacherMapper.selectPage(pageReqVO, studentId);
+    }
+
+    @Override
+    public Long createStudentTeacher(InfraStudentTeacherDO studentTeacher) {
+        // 校验是否已经存在
+        if (studentTeacherMapper.selectByStudentId(studentTeacher.getStudentId()) != null) {
+            throw exception(STUDENT_TEACHER_EXISTS);
+        }
+        // 插入
+        studentTeacherMapper.insert(studentTeacher);
+        return studentTeacher.getId();
+    }
+
+    @Override
+    public void updateStudentTeacher(InfraStudentTeacherDO studentTeacher) {
+        // 校验存在
+        validateStudentTeacherExists(studentTeacher.getId());
+        // 更新
+        studentTeacherMapper.updateById(studentTeacher);
+    }
+
+    @Override
+    public void deleteStudentTeacher(Long id) {
+        // 校验存在
+        validateStudentTeacherExists(id);
+        // 删除
+        studentTeacherMapper.deleteById(id);
+    }
+
+    @Override
+    public InfraStudentTeacherDO getStudentTeacher(Long id) {
+        return studentTeacherMapper.selectById(id);
+    }
+
+    private void validateStudentTeacherExists(Long id) {
+        if (studentTeacherMapper.selectById(id) == null) {
+            throw exception(STUDENT_TEACHER_NOT_EXISTS);
+        }
+    }
+
+    private void deleteStudentTeacherByStudentId(Long studentId) {
+        studentTeacherMapper.deleteByStudentId(studentId);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImplTest
new file mode 100644
index 000000000..b5f4bf0ff
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImplTest
@@ -0,0 +1,146 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import javax.annotation.Resource;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import javax.annotation.Resource;
+import org.springframework.context.annotation.Import;
+import java.util.*;
+import java.time.LocalDateTime;
+
+import static cn.hutool.core.util.RandomUtil.*;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+/**
+ * {@link InfraStudentServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(InfraStudentServiceImpl.class)
+public class InfraStudentServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private InfraStudentServiceImpl studentService;
+
+    @Resource
+    private InfraStudentMapper studentMapper;
+
+    @Test
+    public void testCreateStudent_success() {
+        // 准备参数
+        InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null);
+
+        // 调用
+        Long studentId = studentService.createStudent(createReqVO);
+        // 断言
+        assertNotNull(studentId);
+        // 校验记录的属性是否正确
+        InfraStudentDO student = studentMapper.selectById(studentId);
+        assertPojoEquals(createReqVO, student, "id");
+    }
+
+    @Test
+    public void testUpdateStudent_success() {
+        // mock 数据
+        InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class);
+        studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> {
+            o.setId(dbStudent.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        studentService.updateStudent(updateReqVO);
+        // 校验是否更新正确
+        InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的
+        assertPojoEquals(updateReqVO, student);
+    }
+
+    @Test
+    public void testUpdateStudent_notExists() {
+        // 准备参数
+        InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteStudent_success() {
+        // mock 数据
+        InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class);
+        studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbStudent.getId();
+
+        // 调用
+        studentService.deleteStudent(id);
+       // 校验数据不存在了
+       assertNull(studentMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteStudent_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS);
+    }
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
+    public void testGetStudentPage() {
+       // mock 数据
+       InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到
+           o.setName(null);
+           o.setBirthday(null);
+           o.setSex(null);
+           o.setEnabled(null);
+           o.setCreateTime(null);
+       });
+       studentMapper.insert(dbStudent);
+       // 测试 name 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null)));
+       // 测试 birthday 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null)));
+       // 测试 sex 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null)));
+       // 测试 enabled 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null)));
+       // 测试 createTime 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null)));
+       // 准备参数
+       InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO();
+       reqVO.setName(null);
+       reqVO.setBirthday(null);
+       reqVO.setSex(null);
+       reqVO.setEnabled(null);
+       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+
+       // 调用
+       PageResult<InfraStudentDO> pageResult = studentService.getStudentPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbStudent, pageResult.getList().get(0));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherDO
new file mode 100644
index 000000000..c19cf9fab
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherDO
@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.infra.dal.dataobject.demo;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 学生班主任 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("infra_student_teacher")
+@KeySequence("infra_student_teacher_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfraStudentTeacherDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 学生编号
+     */
+    private Long studentId;
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 简介
+     */
+    private String description;
+    /**
+     * 出生日期
+     */
+    private LocalDateTime birthday;
+    /**
+     * 性别
+     *
+     * 枚举 {@link TODO system_user_sex 对应的类}
+     */
+    private Integer sex;
+    /**
+     * 是否有效
+     *
+     * 枚举 {@link TODO infra_boolean_string 对应的类}
+     */
+    private Boolean enabled;
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 附件
+     */
+    private String video;
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherMapper
new file mode 100644
index 000000000..994212dab
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherMapper
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.infra.dal.mysql.demo;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 学生班主任 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfraStudentTeacherMapper extends BaseMapperX<InfraStudentTeacherDO> {
+
+    default PageResult<InfraStudentTeacherDO> selectPage(PageParam reqVO, Long studentId) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<InfraStudentTeacherDO>()
+            .eq(InfraStudentTeacherDO::getStudentId, studentId)
+            .orderByDesc(InfraStudentTeacherDO::getId));
+    }
+
+    default int deleteByStudentId(Long studentId) {
+        return delete(InfraStudentTeacherDO::getStudentId, studentId);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/js/student b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/js/student
new file mode 100644
index 000000000..211d95e42
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/js/student
@@ -0,0 +1,141 @@
+import request from '@/utils/request'
+
+// 创建学生
+export function createStudent(data) {
+  return request({
+    url: '/infra/student/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新学生
+export function updateStudent(data) {
+  return request({
+    url: '/infra/student/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除学生
+export function deleteStudent(id) {
+  return request({
+    url: '/infra/student/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得学生
+export function getStudent(id) {
+  return request({
+    url: '/infra/student/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得学生分页
+export function getStudentPage(params) {
+  return request({
+    url: '/infra/student/page',
+    method: 'get',
+    params
+  })
+}
+// 导出学生 Excel
+export function exportStudentExcel(params) {
+  return request({
+    url: '/infra/student/export-excel',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
+
+// ==================== 子表（学生联系人） ====================
+  
+  // 获得学生联系人分页
+  export function getStudentContactPage(params) {
+    return request({
+      url: '/infra/student/student-contact/page',
+      method: 'get',
+      params
+    })
+  }
+        // 新增学生联系人
+  export function createStudentContact(data) {
+    return request({
+      url: `/infra/student/student-contact/create`,
+      method: 'post',
+      data
+    })
+  }
+
+  // 修改学生联系人
+  export function updateStudentContact(data) {
+    return request({
+      url: `/infra/student/student-contact/update`,
+      method: 'post',
+      data
+    })
+  }
+
+  // 删除学生联系人
+  export function deleteStudentContact(id) {
+    return request({
+      url: `/infra/student/student-contact/delete?id=` + id,
+      method: 'delete'
+    })
+  }
+
+  // 获得学生联系人
+  export function getStudentContact(id) {
+    return request({
+      url: `/infra/student/student-contact/get?id=` + id,
+      method: 'get'
+    })
+  }
+
+// ==================== 子表（学生班主任） ====================
+  
+  // 获得学生班主任分页
+  export function getStudentTeacherPage(params) {
+    return request({
+      url: '/infra/student/student-teacher/page',
+      method: 'get',
+      params
+    })
+  }
+        // 新增学生班主任
+  export function createStudentTeacher(data) {
+    return request({
+      url: `/infra/student/student-teacher/create`,
+      method: 'post',
+      data
+    })
+  }
+
+  // 修改学生班主任
+  export function updateStudentTeacher(data) {
+    return request({
+      url: `/infra/student/student-teacher/update`,
+      method: 'post',
+      data
+    })
+  }
+
+  // 删除学生班主任
+  export function deleteStudentTeacher(id) {
+    return request({
+      url: `/infra/student/student-teacher/delete?id=` + id,
+      method: 'delete'
+    })
+  }
+
+  // 获得学生班主任
+  export function getStudentTeacher(id) {
+    return request({
+      url: `/infra/student/student-teacher/get?id=` + id,
+      method: 'get'
+    })
+  }
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/h2
new file mode 100644
index 000000000..6c1875f60
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/h2
@@ -0,0 +1,17 @@
+-- 将该建表 SQL 语句，添加到 yudao-module-infra-biz 模块的 test/resources/sql/create_tables.sql 文件里
+CREATE TABLE IF NOT EXISTS "infra_student" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "name" varchar NOT NULL,
+    "description" varchar NOT NULL,
+    "birthday" varchar NOT NULL,
+    "sex" int NOT NULL,
+    "enabled" bit NOT NULL,
+    "avatar" varchar NOT NULL,
+    "video" varchar NOT NULL,
+    "memo" varchar NOT NULL,
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY ("id")
+) COMMENT '学生表';
+
+-- 将该删表 SQL 语句，添加到 yudao-module-infra-biz 模块的 test/resources/sql/clean.sql 文件里
+DELETE FROM "infra_student";
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/sql
new file mode 100644
index 000000000..83df27926
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/sql
@@ -0,0 +1,55 @@
+-- 菜单 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status, component_name
+)
+VALUES (
+    '学生管理', '', 2, 0, 888,
+    'student', '', 'infra/demo/index', 0, 'InfraStudent'
+);
+
+-- 按钮父菜单ID
+-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生查询', 'infra:student:query', 3, 1, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生创建', 'infra:student:create', 3, 2, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生更新', 'infra:student:update', 3, 3, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生删除', 'infra:student:delete', 3, 4, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生导出', 'infra:student:export', 3, 5, @parentId,
+    '', '', '', 0
+);
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactForm
new file mode 100644
index 000000000..2117eead6
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactForm
@@ -0,0 +1,159 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+                     <el-form-item label="名字" prop="name">
+                      <el-input v-model="formData.name" placeholder="请输入名字" />
+                    </el-form-item>
+                    <el-form-item label="简介" prop="description">
+                      <el-input v-model="formData.description" type="textarea" placeholder="请输入内容" />
+                    </el-form-item>
+                    <el-form-item label="出生日期" prop="birthday">
+                      <el-date-picker clearable v-model="formData.birthday" type="date" value-format="timestamp" placeholder="选择出生日期" />
+                    </el-form-item>
+                    <el-form-item label="性别" prop="sex">
+                      <el-select v-model="formData.sex" placeholder="请选择性别">
+                            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="是否有效" prop="enabled">
+                      <el-radio-group v-model="formData.enabled">
+                            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                                      :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="头像" prop="avatar">
+                      <ImageUpload v-model="formData.avatar"/>
+                    </el-form-item>
+                    <el-form-item label="附件" prop="video">
+                      <FileUpload v-model="formData.video"/>
+                    </el-form-item>
+                    <el-form-item label="备注" prop="memo">
+                      <editor v-model="formData.memo" :min-height="192"/>
+                    </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+      import ImageUpload from '@/components/ImageUpload';
+      import FileUpload from '@/components/FileUpload';
+      import Editor from '@/components/Editor';
+  export default {
+    name: "StudentContactForm",
+    components: {
+          ImageUpload,
+          FileUpload,
+          Editor,
+    },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+                            id: undefined,
+                            studentId: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        },
+        // 表单校验
+        formRules: {
+                        studentId: [{ required: true, message: "学生编号不能为空", trigger: "blur" }],
+                        name: [{ required: true, message: "名字不能为空", trigger: "blur" }],
+                        description: [{ required: true, message: "简介不能为空", trigger: "blur" }],
+                        birthday: [{ required: true, message: "出生日期不能为空", trigger: "blur" }],
+                        sex: [{ required: true, message: "性别不能为空", trigger: "change" }],
+                        enabled: [{ required: true, message: "是否有效不能为空", trigger: "blur" }],
+                        avatar: [{ required: true, message: "头像不能为空", trigger: "blur" }],
+                        memo: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        },
+      };
+    },
+    methods: {
+      /** 打开弹窗 */
+      open(id, studentId) {
+        this.dialogVisible = true;
+        this.reset();
+        const that = this;
+        this.formData.studentId = studentId;
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+              StudentApi.getStudentContact(id).then(res=>{
+              that.formData = res.data;
+              that.dialogTitle = "修改学生联系人";
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.dialogTitle = "新增学生联系人";
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.formLoading = true;
+        try {
+          let data = this.formData;
+          this.$refs["formRef"].validate(valid => {
+            if (!valid) {
+              return;
+            }
+            // 修改的提交
+            if (data.id) {
+              StudentApi.updateStudentContact(data).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.dialogVisible = false;
+                this.$emit('success');
+              });
+              return;
+            }
+            // 添加的提交
+            StudentApi.createStudentContact(data).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.dialogVisible = false;
+              this.$emit('success');
+            });
+          });
+        }finally {
+          this.formLoading = false
+        }
+      },
+      /** 表单重置 */
+      reset() {
+        this.formData = {
+                            id: undefined,
+                            studentId: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        };
+        this.resetForm("formRef");
+      },
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactList
new file mode 100644
index 000000000..e0178b1bb
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactList
@@ -0,0 +1,134 @@
+<template>
+  <div class="app-container">
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['infra:student:create']">新增</el-button>
+      </el-col>
+    </el-row>
+            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+                <el-table-column label="编号" align="center" prop="id" />
+                 <el-table-column label="名字" align="center" prop="name" />
+                <el-table-column label="简介" align="center" prop="description" />
+                <el-table-column label="出生日期" align="center" prop="birthday" width="180">
+                  <template v-slot="scope">
+                    <span>{{ parseTime(scope.row.birthday) }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="性别" align="center" prop="sex">
+                  <template v-slot="scope">
+                    <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="是否有效" align="center" prop="enabled">
+                  <template v-slot="scope">
+                    <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="头像" align="center" prop="avatar" />
+                <el-table-column label="附件" align="center" prop="video" />
+                <el-table-column label="备注" align="center" prop="memo" />
+                <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+                  <template v-slot="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                  </template>
+                </el-table-column>
+    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <template v-slot="scope">
+        <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                   v-hasPermi="['infra:student:update']">修改</el-button>
+        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                   v-hasPermi="['infra:student:delete']">删除</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+  <!-- 对话框(添加 / 修改) -->
+  <StudentContactForm ref="formRef" @success="getList" />
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+  import StudentContactForm from './StudentContactForm.vue'
+  export default {
+    name: "StudentContactList",
+    components: {
+       StudentContactForm
+    },
+    props:[
+      'studentId'
+    ],// 学生编号（主表的关联字段）
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 列表的数据
+        list: [],
+        // 列表的总页数
+        total: 0,
+        // 查询参数
+        queryParams: {
+          pageNo: 1,
+          pageSize: 10,
+          studentId: undefined
+        }
+      };
+    },
+    watch:{/** 监听主表的关联字段的变化，加载对应的子表数据 */
+        studentId:{
+            handler(val) {
+              this.queryParams.studentId = val;
+              if (val){
+                this.handleQuery();
+              }
+            },
+            immediate: true
+      }
+    },
+    methods: {
+      /** 查询列表 */
+      getList() {
+        try {
+          this.loading = true;
+          const that = this;
+          StudentApi.getStudentContactPage(this.queryParams).then(response => {
+            that.list = response.data.list;
+            that.total = response.data.total;
+          });
+        } finally {
+          this.loading = false;
+        }
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNo = 1;
+        this.getList();
+      },
+      /** 添加/修改操作 */
+      openForm(id) {
+        if (!this.studentId) {
+          that.$modal.msgError('请选择一个学生');
+          return;
+        }
+        this.$refs["formRef"].open(id, this.studentId);
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const that = this;
+        try {
+          const id = row.id;
+          this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
+            return StudentApi.deleteStudentContact(id);
+          }).then(() => {
+            that.getList();
+            that.$modal.msgSuccess("删除成功");
+          }).catch(() => {});
+        } catch {}
+      },
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentForm
new file mode 100644
index 000000000..f6b171860
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentForm
@@ -0,0 +1,164 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+                    <el-form-item label="名字" prop="name">
+                      <el-input v-model="formData.name" placeholder="请输入名字" />
+                    </el-form-item>
+                    <el-form-item label="简介" prop="description">
+                      <el-input v-model="formData.description" type="textarea" placeholder="请输入内容" />
+                    </el-form-item>
+                    <el-form-item label="出生日期" prop="birthday">
+                      <el-date-picker clearable v-model="formData.birthday" type="date" value-format="timestamp" placeholder="选择出生日期" />
+                    </el-form-item>
+                    <el-form-item label="性别" prop="sex">
+                      <el-select v-model="formData.sex" placeholder="请选择性别">
+                            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="是否有效" prop="enabled">
+                      <el-radio-group v-model="formData.enabled">
+                            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                                      :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="头像">
+                      <ImageUpload v-model="formData.avatar"/>
+                    </el-form-item>
+                    <el-form-item label="附件">
+                      <FileUpload v-model="formData.video"/>
+                    </el-form-item>
+                    <el-form-item label="备注">
+                      <Editor v-model="formData.memo" :min-height="192"/>
+                    </el-form-item>
+      </el-form>
+              <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+  import ImageUpload from '@/components/ImageUpload';
+  import FileUpload from '@/components/FileUpload';
+  import Editor from '@/components/Editor';
+      export default {
+    name: "StudentForm",
+    components: {
+          ImageUpload,
+          FileUpload,
+          Editor,
+                    },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+                            id: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        },
+        // 表单校验
+        formRules: {
+                        name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
+                        description: [{ required: true, message: '简介不能为空', trigger: 'blur' }],
+                        birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
+                        sex: [{ required: true, message: '性别不能为空', trigger: 'change' }],
+                        enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }],
+                        avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }],
+                        video: [{ required: true, message: '附件不能为空', trigger: 'blur' }],
+                        memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+        },
+                        };
+    },
+    methods: {
+      /** 打开弹窗 */
+     open(id) {
+        this.dialogVisible = true;
+        this.reset();
+        const that = this;
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+            StudentApi.getStudent(id).then(res=>{
+              that.formData = res.data;
+              that.title = "修改学生";
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.title = "新增学生";
+              },
+      /** 提交按钮 */
+      submitForm() {
+        this.formLoading = true;
+        try {
+          const that = this;
+          let data = this.formData;
+          let validate = false;
+          // 校验主表
+          this.getRef("formRef").validate(valid => {
+            validate = valid;
+          });
+                  // 所有表单校验通过后方可提交
+          if (!validate) {
+            return;
+          }
+          // 修改的提交
+          if (data.id) {
+                  StudentApi.updateStudent(data).then(response => {
+              that.$modal.msgSuccess("修改成功");
+              that.dialogVisible = false;
+              that.$emit('success');
+            });
+            return;
+          }
+          // 添加的提交
+          StudentApi.createStudent(data).then(response => {
+            that.$modal.msgSuccess("新增成功");
+            that.dialogVisible = false;
+            that.$emit('success');
+          });
+        }finally {
+          this.formLoading = false;
+        }
+      },
+      getRef(refName){
+        return this.$refs[refName];
+      },
+                      /** 表单重置 */
+      reset() {
+        this.formData = {
+                            id: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        };
+        this.resetForm("formRef");
+      },
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherForm
new file mode 100644
index 000000000..cf86657e1
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherForm
@@ -0,0 +1,159 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+                     <el-form-item label="名字" prop="name">
+                      <el-input v-model="formData.name" placeholder="请输入名字" />
+                    </el-form-item>
+                    <el-form-item label="简介" prop="description">
+                      <el-input v-model="formData.description" type="textarea" placeholder="请输入内容" />
+                    </el-form-item>
+                    <el-form-item label="出生日期" prop="birthday">
+                      <el-date-picker clearable v-model="formData.birthday" type="date" value-format="timestamp" placeholder="选择出生日期" />
+                    </el-form-item>
+                    <el-form-item label="性别" prop="sex">
+                      <el-select v-model="formData.sex" placeholder="请选择性别">
+                            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="是否有效" prop="enabled">
+                      <el-radio-group v-model="formData.enabled">
+                            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                                      :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="头像" prop="avatar">
+                      <ImageUpload v-model="formData.avatar"/>
+                    </el-form-item>
+                    <el-form-item label="附件" prop="video">
+                      <FileUpload v-model="formData.video"/>
+                    </el-form-item>
+                    <el-form-item label="备注" prop="memo">
+                      <editor v-model="formData.memo" :min-height="192"/>
+                    </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+      import ImageUpload from '@/components/ImageUpload';
+      import FileUpload from '@/components/FileUpload';
+      import Editor from '@/components/Editor';
+  export default {
+    name: "StudentTeacherForm",
+    components: {
+          ImageUpload,
+          FileUpload,
+          Editor,
+    },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+                            id: undefined,
+                            studentId: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        },
+        // 表单校验
+        formRules: {
+                        studentId: [{ required: true, message: "学生编号不能为空", trigger: "blur" }],
+                        name: [{ required: true, message: "名字不能为空", trigger: "blur" }],
+                        description: [{ required: true, message: "简介不能为空", trigger: "blur" }],
+                        birthday: [{ required: true, message: "出生日期不能为空", trigger: "blur" }],
+                        sex: [{ required: true, message: "性别不能为空", trigger: "change" }],
+                        enabled: [{ required: true, message: "是否有效不能为空", trigger: "blur" }],
+                        avatar: [{ required: true, message: "头像不能为空", trigger: "blur" }],
+                        memo: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        },
+      };
+    },
+    methods: {
+      /** 打开弹窗 */
+      open(id, studentId) {
+        this.dialogVisible = true;
+        this.reset();
+        const that = this;
+        this.formData.studentId = studentId;
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+              StudentApi.getStudentTeacher(id).then(res=>{
+              that.formData = res.data;
+              that.dialogTitle = "修改学生班主任";
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.dialogTitle = "新增学生班主任";
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.formLoading = true;
+        try {
+          let data = this.formData;
+          this.$refs["formRef"].validate(valid => {
+            if (!valid) {
+              return;
+            }
+            // 修改的提交
+            if (data.id) {
+              StudentApi.updateStudentTeacher(data).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.dialogVisible = false;
+                this.$emit('success');
+              });
+              return;
+            }
+            // 添加的提交
+            StudentApi.createStudentTeacher(data).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.dialogVisible = false;
+              this.$emit('success');
+            });
+          });
+        }finally {
+          this.formLoading = false
+        }
+      },
+      /** 表单重置 */
+      reset() {
+        this.formData = {
+                            id: undefined,
+                            studentId: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        };
+        this.resetForm("formRef");
+      },
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherList
new file mode 100644
index 000000000..271afbeb3
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherList
@@ -0,0 +1,134 @@
+<template>
+  <div class="app-container">
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['infra:student:create']">新增</el-button>
+      </el-col>
+    </el-row>
+            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+                <el-table-column label="编号" align="center" prop="id" />
+                 <el-table-column label="名字" align="center" prop="name" />
+                <el-table-column label="简介" align="center" prop="description" />
+                <el-table-column label="出生日期" align="center" prop="birthday" width="180">
+                  <template v-slot="scope">
+                    <span>{{ parseTime(scope.row.birthday) }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="性别" align="center" prop="sex">
+                  <template v-slot="scope">
+                    <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="是否有效" align="center" prop="enabled">
+                  <template v-slot="scope">
+                    <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="头像" align="center" prop="avatar" />
+                <el-table-column label="附件" align="center" prop="video" />
+                <el-table-column label="备注" align="center" prop="memo" />
+                <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+                  <template v-slot="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                  </template>
+                </el-table-column>
+    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <template v-slot="scope">
+        <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                   v-hasPermi="['infra:student:update']">修改</el-button>
+        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                   v-hasPermi="['infra:student:delete']">删除</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+  <!-- 对话框(添加 / 修改) -->
+  <StudentTeacherForm ref="formRef" @success="getList" />
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+  import StudentTeacherForm from './StudentTeacherForm.vue'
+  export default {
+    name: "StudentTeacherList",
+    components: {
+       StudentTeacherForm
+    },
+    props:[
+      'studentId'
+    ],// 学生编号（主表的关联字段）
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 列表的数据
+        list: [],
+        // 列表的总页数
+        total: 0,
+        // 查询参数
+        queryParams: {
+          pageNo: 1,
+          pageSize: 10,
+          studentId: undefined
+        }
+      };
+    },
+    watch:{/** 监听主表的关联字段的变化，加载对应的子表数据 */
+        studentId:{
+            handler(val) {
+              this.queryParams.studentId = val;
+              if (val){
+                this.handleQuery();
+              }
+            },
+            immediate: true
+      }
+    },
+    methods: {
+      /** 查询列表 */
+      getList() {
+        try {
+          this.loading = true;
+          const that = this;
+          StudentApi.getStudentTeacherPage(this.queryParams).then(response => {
+            that.list = response.data.list;
+            that.total = response.data.total;
+          });
+        } finally {
+          this.loading = false;
+        }
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNo = 1;
+        this.getList();
+      },
+      /** 添加/修改操作 */
+      openForm(id) {
+        if (!this.studentId) {
+          that.$modal.msgError('请选择一个学生');
+          return;
+        }
+        this.$refs["formRef"].open(id, this.studentId);
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const that = this;
+        try {
+          const id = row.id;
+          this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
+            return StudentApi.deleteStudentTeacher(id);
+          }).then(() => {
+            that.getList();
+            that.$modal.msgSuccess("删除成功");
+          }).catch(() => {});
+        } catch {}
+      },
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/index
new file mode 100644
index 000000000..528bf1589
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/index
@@ -0,0 +1,241 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="名字" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入名字" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="出生日期" prop="birthday">
+        <el-date-picker clearable v-model="queryParams.birthday" type="date" value-format="yyyy-MM-dd" placeholder="选择出生日期" />
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否有效" prop="enabled">
+        <el-select v-model="queryParams.enabled" placeholder="请选择是否有效" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['infra:student:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['infra:student:export']">导出</el-button>
+      </el-col>
+              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+            <el-table
+          v-loading="loading"
+          :data="list"
+          :stripe="true"
+          :highlight-current-row="true"
+          :show-overflow-tooltip="true"
+          @current-change="handleCurrentChange"
+      >
+                      <el-table-column label="编号" align="center" prop="id">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.id" />
+        </template>
+      </el-table-column>
+      <el-table-column label="名字" align="center" prop="name">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.name" />
+        </template>
+      </el-table-column>
+      <el-table-column label="简介" align="center" prop="description">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.description" />
+        </template>
+      </el-table-column>
+      <el-table-column label="出生日期" align="center" prop="birthday" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.birthday) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" align="center" prop="sex">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否有效" align="center" prop="enabled">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
+        </template>
+      </el-table-column>
+      <el-table-column label="头像" align="center" prop="avatar">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.avatar" />
+        </template>
+      </el-table-column>
+      <el-table-column label="附件" align="center" prop="video">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.video" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="memo">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.memo" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['infra:student:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['infra:student:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 对话框(添加 / 修改) -->
+    <StudentForm ref="formRef" @success="getList" />
+      <!-- 子表的列表 -->
+      <el-tabs v-model="subTabsName">
+            <el-tab-pane label="学生联系人" name="studentContact">
+              <StudentContactList v-if="currentRow.id" :student-id="currentRow.id" />
+            </el-tab-pane>
+            <el-tab-pane label="学生班主任" name="studentTeacher">
+              <StudentTeacherList v-if="currentRow.id" :student-id="currentRow.id" />
+            </el-tab-pane>
+      </el-tabs>
+  </div>
+</template>
+
+<script>
+import * as StudentApi from '@/api/infra/demo';
+import StudentForm from './StudentForm.vue';
+    import StudentContactList from './components/StudentContactList.vue'
+    import StudentTeacherList from './components/StudentTeacherList.vue'
+export default {
+  name: "Student",
+  components: {
+          StudentForm,
+          StudentContactList,
+          StudentTeacherList,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+              // 总条数
+        total: 0,
+      // 学生列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+                    pageNo: 1,
+            pageSize: 10,
+        name: null,
+        birthday: null,
+        sex: null,
+        enabled: null,
+        createTime: [],
+      },
+                      /** 子表的列表 */
+              subTabsName: 'studentContact'
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      try {
+      this.loading = true;
+            StudentApi.getStudentPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+      });
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const that = this;
+      try {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
+          return StudentApi.deleteStudent(id);
+        }).then(() => {
+        that.getList();
+        that.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      } catch {}
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const that = this;
+      try {
+          this.$modal.confirm('是否确认导出所有学生数据项?').then(() => {
+              that.exportLoading = true;
+              return StudentApi.exportStudentExcel(params);
+            }).then(response => {
+              that.$download.excel(response, '学生.xls');
+            });
+      } catch {
+      } finally {
+        that.exportLoading = false;
+      }
+    },
+              /** 选中行操作 */
+        handleCurrentChange(row) {
+         this.currentRow = row;
+          /** 子表的列表 */
+          this.subTabsName = 'studentContact';
+        },
+        }
+};
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/xml/InfraStudentMapper
new file mode 100644
index 000000000..155aa5c27
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/xml/InfraStudentMapper
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/assert.json
new file mode 100644
index 000000000..f95ae9af1
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/assert.json
@@ -0,0 +1,73 @@
+[ {
+  "contentPath" : "java/InfraStudentPageReqVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentPageReqVO.java"
+}, {
+  "contentPath" : "java/InfraStudentRespVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentRespVO.java"
+}, {
+  "contentPath" : "java/InfraStudentSaveReqVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentSaveReqVO.java"
+}, {
+  "contentPath" : "java/InfraStudentController",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/InfraStudentController.java"
+}, {
+  "contentPath" : "java/InfraStudentDO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentDO.java"
+}, {
+  "contentPath" : "java/InfraStudentContactDO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentContactDO.java"
+}, {
+  "contentPath" : "java/InfraStudentTeacherDO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentTeacherDO.java"
+}, {
+  "contentPath" : "java/InfraStudentMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentMapper.java"
+}, {
+  "contentPath" : "java/InfraStudentContactMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentContactMapper.java"
+}, {
+  "contentPath" : "java/InfraStudentTeacherMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentTeacherMapper.java"
+}, {
+  "contentPath" : "xml/InfraStudentMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/demo/InfraStudentMapper.xml"
+}, {
+  "contentPath" : "java/InfraStudentServiceImpl",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentServiceImpl.java"
+}, {
+  "contentPath" : "java/InfraStudentService",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentService.java"
+}, {
+  "contentPath" : "java/InfraStudentServiceImplTest",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentServiceImplTest.java"
+}, {
+  "contentPath" : "java/ErrorCodeConstants_手动操作",
+  "filePath" : "yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants_手动操作.java"
+}, {
+  "contentPath" : "sql/sql",
+  "filePath" : "sql/sql.sql"
+}, {
+  "contentPath" : "sql/h2",
+  "filePath" : "sql/h2.sql"
+}, {
+  "contentPath" : "vue/index",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue"
+}, {
+  "contentPath" : "js/student",
+  "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js"
+}, {
+  "contentPath" : "vue/StudentForm",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue"
+}, {
+  "contentPath" : "vue/StudentContactForm",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/components/StudentContactForm.vue"
+}, {
+  "contentPath" : "vue/StudentTeacherForm",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/components/StudentTeacherForm.vue"
+}, {
+  "contentPath" : "vue/StudentContactList",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/components/StudentContactList.vue"
+}, {
+  "contentPath" : "vue/StudentTeacherList",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/components/StudentTeacherList.vue"
+} ]
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/ErrorCodeConstants_手动操作
new file mode 100644
index 000000000..f8be66202
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/ErrorCodeConstants_手动操作
@@ -0,0 +1,3 @@
+// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！
+// ========== 学生 TODO 补充编号 ==========
+ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在");
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactDO
new file mode 100644
index 000000000..17c668eaa
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactDO
@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.infra.dal.dataobject.demo;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 学生联系人 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("infra_student_contact")
+@KeySequence("infra_student_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfraStudentContactDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 学生编号
+     */
+    private Long studentId;
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 简介
+     */
+    private String description;
+    /**
+     * 出生日期
+     */
+    private LocalDateTime birthday;
+    /**
+     * 性别
+     *
+     * 枚举 {@link TODO system_user_sex 对应的类}
+     */
+    private Integer sex;
+    /**
+     * 是否有效
+     *
+     * 枚举 {@link TODO infra_boolean_string 对应的类}
+     */
+    private Boolean enabled;
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 附件
+     */
+    private String video;
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactMapper
new file mode 100644
index 000000000..35bbd53c2
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactMapper
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.infra.dal.mysql.demo;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 学生联系人 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfraStudentContactMapper extends BaseMapperX<InfraStudentContactDO> {
+
+    default List<InfraStudentContactDO> selectListByStudentId(Long studentId) {
+        return selectList(InfraStudentContactDO::getStudentId, studentId);
+    }
+
+    default int deleteByStudentId(Long studentId) {
+        return delete(InfraStudentContactDO::getStudentId, studentId);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentController
new file mode 100644
index 000000000..b9a587b44
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentController
@@ -0,0 +1,117 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import cn.iocoder.yudao.module.infra.service.demo.InfraStudentService;
+
+@Tag(name = "管理后台 - 学生")
+@RestController
+@RequestMapping("/infra/student")
+@Validated
+public class InfraStudentController {
+
+    @Resource
+    private InfraStudentService studentService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建学生")
+    @PreAuthorize("@ss.hasPermission('infra:student:create')")
+    public CommonResult<Long> createStudent(@Valid @RequestBody InfraStudentSaveReqVO createReqVO) {
+        return success(studentService.createStudent(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新学生")
+    @PreAuthorize("@ss.hasPermission('infra:student:update')")
+    public CommonResult<Boolean> updateStudent(@Valid @RequestBody InfraStudentSaveReqVO updateReqVO) {
+        studentService.updateStudent(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除学生")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('infra:student:delete')")
+    public CommonResult<Boolean> deleteStudent(@RequestParam("id") Long id) {
+        studentService.deleteStudent(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得学生")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<InfraStudentRespVO> getStudent(@RequestParam("id") Long id) {
+        InfraStudentDO student = studentService.getStudent(id);
+        return success(BeanUtils.toBean(student, InfraStudentRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得学生分页")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<PageResult<InfraStudentRespVO>> getStudentPage(@Valid InfraStudentPageReqVO pageReqVO) {
+        PageResult<InfraStudentDO> pageResult = studentService.getStudentPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, InfraStudentRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出学生 Excel")
+    @PreAuthorize("@ss.hasPermission('infra:student:export')")
+    @OperateLog(type = EXPORT)
+    public void exportStudentExcel(@Valid InfraStudentPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<InfraStudentDO> list = studentService.getStudentPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "学生.xls", "数据", InfraStudentRespVO.class,
+                        BeanUtils.toBean(list, InfraStudentRespVO.class));
+    }
+
+    // ==================== 子表（学生联系人） ====================
+
+    @GetMapping("/student-contact/list-by-student-id")
+    @Operation(summary = "获得学生联系人列表")
+    @Parameter(name = "studentId", description = "学生编号")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<List<InfraStudentContactDO>> getStudentContactListByStudentId(@RequestParam("studentId") Long studentId) {
+        return success(studentService.getStudentContactListByStudentId(studentId));
+    }
+
+    // ==================== 子表（学生班主任） ====================
+
+    @GetMapping("/student-teacher/get-by-student-id")
+    @Operation(summary = "获得学生班主任")
+    @Parameter(name = "studentId", description = "学生编号")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<InfraStudentTeacherDO> getStudentTeacherByStudentId(@RequestParam("studentId") Long studentId) {
+        return success(studentService.getStudentTeacherByStudentId(studentId));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentDO
new file mode 100644
index 000000000..b0d4bd216
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentDO
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.infra.dal.dataobject.demo;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 学生 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("infra_student")
+@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfraStudentDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 简介
+     */
+    private String description;
+    /**
+     * 出生日期
+     */
+    private LocalDateTime birthday;
+    /**
+     * 性别
+     *
+     * 枚举 {@link TODO system_user_sex 对应的类}
+     */
+    private Integer sex;
+    /**
+     * 是否有效
+     *
+     * 枚举 {@link TODO infra_boolean_string 对应的类}
+     */
+    private Boolean enabled;
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 附件
+     */
+    private String video;
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentMapper
new file mode 100644
index 000000000..34e70a082
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentMapper
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.infra.dal.mysql.demo;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+
+/**
+ * 学生 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfraStudentMapper extends BaseMapperX<InfraStudentDO> {
+
+    default PageResult<InfraStudentDO> selectPage(InfraStudentPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<InfraStudentDO>()
+                .likeIfPresent(InfraStudentDO::getName, reqVO.getName())
+                .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday())
+                .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex())
+                .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled())
+                .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(InfraStudentDO::getId));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentPageReqVO
new file mode 100644
index 000000000..41a373012
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentPageReqVO
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 学生分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class InfraStudentPageReqVO extends PageParam {
+
+    @Schema(description = "名字", example = "芋头")
+    private String name;
+
+    @Schema(description = "出生日期")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", example = "1")
+    private Integer sex;
+
+    @Schema(description = "是否有效", example = "true")
+    private Boolean enabled;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentRespVO
new file mode 100644
index 000000000..c41a5501f
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentRespVO
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 学生 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class InfraStudentRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @ExcelProperty("编号")
+    private Long id;
+
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋头")
+    @ExcelProperty("名字")
+    private String name;
+
+    @Schema(description = "简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是介绍")
+    @ExcelProperty("简介")
+    private String description;
+
+    @Schema(description = "出生日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("出生日期")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty(value = "性别", converter = DictConvert.class)
+    @DictFormat("system_user_sex") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer sex;
+
+    @Schema(description = "是否有效", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @ExcelProperty(value = "是否有效", converter = DictConvert.class)
+    @DictFormat("infra_boolean_string") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Boolean enabled;
+
+    @Schema(description = "头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png")
+    @ExcelProperty("头像")
+    private String avatar;
+
+    @Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.mp4")
+    @ExcelProperty("附件")
+    private String video;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是备注")
+    @ExcelProperty("备注")
+    private String memo;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentSaveReqVO
new file mode 100644
index 000000000..faa491dfb
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentSaveReqVO
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+
+@Schema(description = "管理后台 - 学生新增/修改 Request VO")
+@Data
+public class InfraStudentSaveReqVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋头")
+    @NotEmpty(message = "名字不能为空")
+    private String name;
+
+    @Schema(description = "简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是介绍")
+    @NotEmpty(message = "简介不能为空")
+    private String description;
+
+    @Schema(description = "出生日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "出生日期不能为空")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "性别不能为空")
+    private Integer sex;
+
+    @Schema(description = "是否有效", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @NotNull(message = "是否有效不能为空")
+    private Boolean enabled;
+
+    @Schema(description = "头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png")
+    @NotEmpty(message = "头像不能为空")
+    private String avatar;
+
+    @Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.mp4")
+    @NotEmpty(message = "附件不能为空")
+    private String video;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是备注")
+    @NotEmpty(message = "备注不能为空")
+    private String memo;
+
+    @Schema(description = "学生联系人列表")
+    private List<InfraStudentContactDO> studentContacts;
+
+    @Schema(description = "学生班主任")
+    private InfraStudentTeacherDO studentTeacher;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentService
new file mode 100644
index 000000000..afa7d22eb
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentService
@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+/**
+ * 学生 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface InfraStudentService {
+
+    /**
+     * 创建学生
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createStudent(@Valid InfraStudentSaveReqVO createReqVO);
+
+    /**
+     * 更新学生
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateStudent(@Valid InfraStudentSaveReqVO updateReqVO);
+
+    /**
+     * 删除学生
+     *
+     * @param id 编号
+     */
+    void deleteStudent(Long id);
+
+    /**
+     * 获得学生
+     *
+     * @param id 编号
+     * @return 学生
+     */
+    InfraStudentDO getStudent(Long id);
+
+    /**
+     * 获得学生分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 学生分页
+     */
+    PageResult<InfraStudentDO> getStudentPage(InfraStudentPageReqVO pageReqVO);
+
+    // ==================== 子表（学生联系人） ====================
+
+    /**
+     * 获得学生联系人列表
+     *
+     * @param studentId 学生编号
+     * @return 学生联系人列表
+     */
+    List<InfraStudentContactDO> getStudentContactListByStudentId(Long studentId);
+
+    // ==================== 子表（学生班主任） ====================
+
+    /**
+     * 获得学生班主任
+     *
+     * @param studentId 学生编号
+     * @return 学生班主任
+     */
+    InfraStudentTeacherDO getStudentTeacherByStudentId(Long studentId);
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl
new file mode 100644
index 000000000..c57cba613
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl
@@ -0,0 +1,147 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper;
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentContactMapper;
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentTeacherMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
+
+/**
+ * 学生 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class InfraStudentServiceImpl implements InfraStudentService {
+
+    @Resource
+    private InfraStudentMapper studentMapper;
+    @Resource
+    private InfraStudentContactMapper studentContactMapper;
+    @Resource
+    private InfraStudentTeacherMapper studentTeacherMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long createStudent(InfraStudentSaveReqVO createReqVO) {
+        // 插入
+        InfraStudentDO student = BeanUtils.toBean(createReqVO, InfraStudentDO.class);
+        studentMapper.insert(student);
+
+        // 插入子表
+        createStudentContactList(student.getId(), createReqVO.getStudentContacts());
+        createStudentTeacher(student.getId(), createReqVO.getStudentTeacher());
+        // 返回
+        return student.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateStudent(InfraStudentSaveReqVO updateReqVO) {
+        // 校验存在
+        validateStudentExists(updateReqVO.getId());
+        // 更新
+        InfraStudentDO updateObj = BeanUtils.toBean(updateReqVO, InfraStudentDO.class);
+        studentMapper.updateById(updateObj);
+
+        // 更新子表
+        updateStudentContactList(updateReqVO.getId(), updateReqVO.getStudentContacts());
+        updateStudentTeacher(updateReqVO.getId(), updateReqVO.getStudentTeacher());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteStudent(Long id) {
+        // 校验存在
+        validateStudentExists(id);
+        // 删除
+        studentMapper.deleteById(id);
+
+        // 删除子表
+        deleteStudentContactByStudentId(id);
+        deleteStudentTeacherByStudentId(id);
+    }
+
+    private void validateStudentExists(Long id) {
+        if (studentMapper.selectById(id) == null) {
+            throw exception(STUDENT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public InfraStudentDO getStudent(Long id) {
+        return studentMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<InfraStudentDO> getStudentPage(InfraStudentPageReqVO pageReqVO) {
+        return studentMapper.selectPage(pageReqVO);
+    }
+
+    // ==================== 子表（学生联系人） ====================
+
+    @Override
+    public List<InfraStudentContactDO> getStudentContactListByStudentId(Long studentId) {
+        return studentContactMapper.selectListByStudentId(studentId);
+    }
+
+    private void createStudentContactList(Long studentId, List<InfraStudentContactDO> list) {
+        list.forEach(o -> o.setStudentId(studentId));
+        studentContactMapper.insertBatch(list);
+    }
+
+    private void updateStudentContactList(Long studentId, List<InfraStudentContactDO> list) {
+        deleteStudentContactByStudentId(studentId);
+		list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
+        createStudentContactList(studentId, list);
+    }
+
+    private void deleteStudentContactByStudentId(Long studentId) {
+        studentContactMapper.deleteByStudentId(studentId);
+    }
+
+    // ==================== 子表（学生班主任） ====================
+
+    @Override
+    public InfraStudentTeacherDO getStudentTeacherByStudentId(Long studentId) {
+        return studentTeacherMapper.selectByStudentId(studentId);
+    }
+
+    private void createStudentTeacher(Long studentId, InfraStudentTeacherDO studentTeacher) {
+        if (studentTeacher == null) {
+            return;
+        }
+        studentTeacher.setStudentId(studentId);
+        studentTeacherMapper.insert(studentTeacher);
+    }
+
+    private void updateStudentTeacher(Long studentId, InfraStudentTeacherDO studentTeacher) {
+        if (studentTeacher == null) {
+			return;
+        }
+        studentTeacher.setStudentId(studentId);
+        studentTeacher.setUpdater(null).setUpdateTime(null); // 解决更新情况下：updateTime 不更新
+        studentTeacherMapper.insertOrUpdate(studentTeacher);
+    }
+
+    private void deleteStudentTeacherByStudentId(Long studentId) {
+        studentTeacherMapper.deleteByStudentId(studentId);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImplTest
new file mode 100644
index 000000000..b5f4bf0ff
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImplTest
@@ -0,0 +1,146 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import javax.annotation.Resource;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import javax.annotation.Resource;
+import org.springframework.context.annotation.Import;
+import java.util.*;
+import java.time.LocalDateTime;
+
+import static cn.hutool.core.util.RandomUtil.*;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+/**
+ * {@link InfraStudentServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(InfraStudentServiceImpl.class)
+public class InfraStudentServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private InfraStudentServiceImpl studentService;
+
+    @Resource
+    private InfraStudentMapper studentMapper;
+
+    @Test
+    public void testCreateStudent_success() {
+        // 准备参数
+        InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null);
+
+        // 调用
+        Long studentId = studentService.createStudent(createReqVO);
+        // 断言
+        assertNotNull(studentId);
+        // 校验记录的属性是否正确
+        InfraStudentDO student = studentMapper.selectById(studentId);
+        assertPojoEquals(createReqVO, student, "id");
+    }
+
+    @Test
+    public void testUpdateStudent_success() {
+        // mock 数据
+        InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class);
+        studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> {
+            o.setId(dbStudent.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        studentService.updateStudent(updateReqVO);
+        // 校验是否更新正确
+        InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的
+        assertPojoEquals(updateReqVO, student);
+    }
+
+    @Test
+    public void testUpdateStudent_notExists() {
+        // 准备参数
+        InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteStudent_success() {
+        // mock 数据
+        InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class);
+        studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbStudent.getId();
+
+        // 调用
+        studentService.deleteStudent(id);
+       // 校验数据不存在了
+       assertNull(studentMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteStudent_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS);
+    }
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
+    public void testGetStudentPage() {
+       // mock 数据
+       InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到
+           o.setName(null);
+           o.setBirthday(null);
+           o.setSex(null);
+           o.setEnabled(null);
+           o.setCreateTime(null);
+       });
+       studentMapper.insert(dbStudent);
+       // 测试 name 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null)));
+       // 测试 birthday 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null)));
+       // 测试 sex 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null)));
+       // 测试 enabled 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null)));
+       // 测试 createTime 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null)));
+       // 准备参数
+       InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO();
+       reqVO.setName(null);
+       reqVO.setBirthday(null);
+       reqVO.setSex(null);
+       reqVO.setEnabled(null);
+       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+
+       // 调用
+       PageResult<InfraStudentDO> pageResult = studentService.getStudentPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbStudent, pageResult.getList().get(0));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherDO
new file mode 100644
index 000000000..c19cf9fab
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherDO
@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.infra.dal.dataobject.demo;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 学生班主任 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("infra_student_teacher")
+@KeySequence("infra_student_teacher_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfraStudentTeacherDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 学生编号
+     */
+    private Long studentId;
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 简介
+     */
+    private String description;
+    /**
+     * 出生日期
+     */
+    private LocalDateTime birthday;
+    /**
+     * 性别
+     *
+     * 枚举 {@link TODO system_user_sex 对应的类}
+     */
+    private Integer sex;
+    /**
+     * 是否有效
+     *
+     * 枚举 {@link TODO infra_boolean_string 对应的类}
+     */
+    private Boolean enabled;
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 附件
+     */
+    private String video;
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherMapper
new file mode 100644
index 000000000..0521bbaf4
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherMapper
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.infra.dal.mysql.demo;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 学生班主任 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfraStudentTeacherMapper extends BaseMapperX<InfraStudentTeacherDO> {
+
+    default InfraStudentTeacherDO selectByStudentId(Long studentId) {
+        return selectOne(InfraStudentTeacherDO::getStudentId, studentId);
+    }
+
+    default int deleteByStudentId(Long studentId) {
+        return delete(InfraStudentTeacherDO::getStudentId, studentId);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/js/student b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/js/student
new file mode 100644
index 000000000..b4e6ac5e4
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/js/student
@@ -0,0 +1,74 @@
+import request from '@/utils/request'
+
+// 创建学生
+export function createStudent(data) {
+  return request({
+    url: '/infra/student/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新学生
+export function updateStudent(data) {
+  return request({
+    url: '/infra/student/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除学生
+export function deleteStudent(id) {
+  return request({
+    url: '/infra/student/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得学生
+export function getStudent(id) {
+  return request({
+    url: '/infra/student/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得学生分页
+export function getStudentPage(params) {
+  return request({
+    url: '/infra/student/page',
+    method: 'get',
+    params
+  })
+}
+// 导出学生 Excel
+export function exportStudentExcel(params) {
+  return request({
+    url: '/infra/student/export-excel',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
+
+// ==================== 子表（学生联系人） ====================
+  
+    // 获得学生联系人列表
+    export function getStudentContactListByStudentId(studentId) {
+      return request({
+        url: `/infra/student/student-contact/list-by-student-id?studentId=` + studentId,
+        method: 'get'
+      })
+    }
+  
+// ==================== 子表（学生班主任） ====================
+  
+    // 获得学生班主任
+    export function getStudentTeacherByStudentId(studentId) {
+      return request({
+        url: `/infra/student/student-teacher/get-by-student-id?studentId=` + studentId,
+        method: 'get'
+      })
+    }
+  
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/h2
new file mode 100644
index 000000000..6c1875f60
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/h2
@@ -0,0 +1,17 @@
+-- 将该建表 SQL 语句，添加到 yudao-module-infra-biz 模块的 test/resources/sql/create_tables.sql 文件里
+CREATE TABLE IF NOT EXISTS "infra_student" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "name" varchar NOT NULL,
+    "description" varchar NOT NULL,
+    "birthday" varchar NOT NULL,
+    "sex" int NOT NULL,
+    "enabled" bit NOT NULL,
+    "avatar" varchar NOT NULL,
+    "video" varchar NOT NULL,
+    "memo" varchar NOT NULL,
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY ("id")
+) COMMENT '学生表';
+
+-- 将该删表 SQL 语句，添加到 yudao-module-infra-biz 模块的 test/resources/sql/clean.sql 文件里
+DELETE FROM "infra_student";
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/sql
new file mode 100644
index 000000000..83df27926
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/sql
@@ -0,0 +1,55 @@
+-- 菜单 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status, component_name
+)
+VALUES (
+    '学生管理', '', 2, 0, 888,
+    'student', '', 'infra/demo/index', 0, 'InfraStudent'
+);
+
+-- 按钮父菜单ID
+-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生查询', 'infra:student:query', 3, 1, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生创建', 'infra:student:create', 3, 2, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生更新', 'infra:student:update', 3, 3, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生删除', 'infra:student:delete', 3, 4, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生导出', 'infra:student:export', 3, 5, @parentId,
+    '', '', '', 0
+);
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactForm
new file mode 100644
index 000000000..1e57837a4
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactForm
@@ -0,0 +1,176 @@
+<template>
+  <div class="app-container">
+      <el-form
+          ref="formRef"
+          :model="formData"
+          :rules="formRules"
+          v-loading="formLoading"
+          label-width="0px"
+          :inline-message="true"
+      >
+        <el-table :data="formData" class="-mt-10px">
+          <el-table-column label="序号" type="index" width="100" />
+                       <el-table-column label="名字" min-width="150">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.name`" :rules="formRules.name" class="mb-0px!">
+                            <el-input v-model="row.name" placeholder="请输入名字" />
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="简介" min-width="200">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.description`" :rules="formRules.description" class="mb-0px!">
+                            <el-input v-model="row.description" type="textarea" placeholder="请输入简介" />
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="出生日期" min-width="150">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.birthday`" :rules="formRules.birthday" class="mb-0px!">
+                            <el-date-picker clearable v-model="row.birthday" type="date" value-format="timestamp" placeholder="选择出生日期" />
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="性别" min-width="150">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.sex`" :rules="formRules.sex" class="mb-0px!">
+                            <el-select v-model="row.sex" placeholder="请选择性别">
+                                  <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                                             :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                            </el-select>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="是否有效" min-width="150">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.enabled`" :rules="formRules.enabled" class="mb-0px!">
+                            <el-radio-group v-model="row.enabled">
+                                  <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                                            :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+                            </el-radio-group>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="头像" min-width="200">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.avatar`" :rules="formRules.avatar" class="mb-0px!">
+                            <ImageUpload v-model="row.avatar"/>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="附件" min-width="200">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.video`" :rules="formRules.video" class="mb-0px!">
+                            <FileUpload v-model="row.video"/>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="备注" min-width="400">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.memo`" :rules="formRules.memo" class="mb-0px!">
+                            <Editor v-model="row.memo" :min-height="192"/>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+          <el-table-column align="center" fixed="right" label="操作" width="60">
+            <template v-slot="{ $index }">
+              <el-link @click="handleDelete($index)">—</el-link>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <el-row justify="center" class="mt-3">
+        <el-button @click="handleAdd" round>+ 添加学生联系人</el-button>
+      </el-row>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+      import ImageUpload from '@/components/ImageUpload';
+      import FileUpload from '@/components/FileUpload';
+      import Editor from '@/components/Editor';
+  export default {
+    name: "StudentContactForm",
+    components: {
+          ImageUpload,
+          FileUpload,
+          Editor,
+    },
+    props:[
+      'studentId'
+    ],// 学生编号（主表的关联字段）
+    data() {
+      return {
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: [],
+        // 表单校验
+        formRules: {
+                        studentId: [{ required: true, message: "学生编号不能为空", trigger: "blur" }],
+                        name: [{ required: true, message: "名字不能为空", trigger: "blur" }],
+                        description: [{ required: true, message: "简介不能为空", trigger: "blur" }],
+                        birthday: [{ required: true, message: "出生日期不能为空", trigger: "blur" }],
+                        sex: [{ required: true, message: "性别不能为空", trigger: "change" }],
+                        enabled: [{ required: true, message: "是否有效不能为空", trigger: "blur" }],
+                        avatar: [{ required: true, message: "头像不能为空", trigger: "blur" }],
+                        memo: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        },
+      };
+    },
+    watch:{/** 监听主表的关联字段的变化，加载对应的子表数据 */
+      studentId:{
+        handler(val) {
+          // 1. 重置表单
+              this.formData = []
+          // 2. val 非空，则加载数据
+          if (!val) {
+            return;
+          }
+          try {
+            this.formLoading = true;
+            const that = this;
+            StudentApi.getStudentContactListByStudentId(val).then(res=>{
+              that.formData = res.data;
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        },
+        immediate: true
+      }
+    },
+    methods: {
+          /** 新增按钮操作 */
+          handleAdd() {
+            const row = {
+                                id: undefined,
+                                studentId: undefined,
+                                name: undefined,
+                                description: undefined,
+                                birthday: undefined,
+                                sex: undefined,
+                                enabled: undefined,
+                                avatar: undefined,
+                                video: undefined,
+                                memo: undefined,
+            }
+            row.studentId = this.studentId
+            this.formData.push(row)
+          },
+          /** 删除按钮操作 */
+          handleDelete(index) {
+            this.formData.splice(index, 1)
+          },
+      /** 表单校验 */
+      validate(){
+        return this.$refs["formRef"].validate()
+      },
+      /** 表单值 */
+      getData(){
+        return this.formData
+      }
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactList
new file mode 100644
index 000000000..6afac6d26
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactList
@@ -0,0 +1,91 @@
+<template>
+  <div class="app-container">
+            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+                <el-table-column label="编号" align="center" prop="id" />
+                 <el-table-column label="名字" align="center" prop="name" />
+                <el-table-column label="简介" align="center" prop="description" />
+                <el-table-column label="出生日期" align="center" prop="birthday" width="180">
+                  <template v-slot="scope">
+                    <span>{{ parseTime(scope.row.birthday) }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="性别" align="center" prop="sex">
+                  <template v-slot="scope">
+                    <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="是否有效" align="center" prop="enabled">
+                  <template v-slot="scope">
+                    <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="头像" align="center" prop="avatar" />
+                <el-table-column label="附件" align="center" prop="video" />
+                <el-table-column label="备注" align="center" prop="memo" />
+                <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+                  <template v-slot="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                  </template>
+                </el-table-column>
+    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <template v-slot="scope">
+        <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                   v-hasPermi="['infra:student:update']">修改</el-button>
+        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                   v-hasPermi="['infra:student:delete']">删除</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+  export default {
+    name: "StudentContactList",
+    props:[
+      'studentId'
+    ],// 学生编号（主表的关联字段）
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 列表的数据
+        list: [],
+      };
+    },
+    created() {
+      this.getList();
+    },
+    watch:{/** 监听主表的关联字段的变化，加载对应的子表数据 */
+        studentId:{
+            handler(val) {
+              this.queryParams.studentId = val;
+              if (val){
+                this.handleQuery();
+              }
+            },
+            immediate: true
+      }
+    },
+    methods: {
+      /** 查询列表 */
+      getList() {
+        try {
+          this.loading = true;
+          const that = this;
+                StudentApi.getStudentContactListByStudentId(this.studentId).then(response=>{
+                  that.list = response.data;
+              })
+        } finally {
+          this.loading = false;
+        }
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNo = 1;
+        this.getList();
+      },
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentForm
new file mode 100644
index 000000000..140db4beb
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentForm
@@ -0,0 +1,221 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+                    <el-form-item label="名字" prop="name">
+                      <el-input v-model="formData.name" placeholder="请输入名字" />
+                    </el-form-item>
+                    <el-form-item label="简介" prop="description">
+                      <el-input v-model="formData.description" type="textarea" placeholder="请输入内容" />
+                    </el-form-item>
+                    <el-form-item label="出生日期" prop="birthday">
+                      <el-date-picker clearable v-model="formData.birthday" type="date" value-format="timestamp" placeholder="选择出生日期" />
+                    </el-form-item>
+                    <el-form-item label="性别" prop="sex">
+                      <el-select v-model="formData.sex" placeholder="请选择性别">
+                            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="是否有效" prop="enabled">
+                      <el-radio-group v-model="formData.enabled">
+                            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                                      :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="头像">
+                      <ImageUpload v-model="formData.avatar"/>
+                    </el-form-item>
+                    <el-form-item label="附件">
+                      <FileUpload v-model="formData.video"/>
+                    </el-form-item>
+                    <el-form-item label="备注">
+                      <Editor v-model="formData.memo" :min-height="192"/>
+                    </el-form-item>
+      </el-form>
+                  <!-- 子表的表单 -->
+          <el-tabs v-model="subTabsName">
+                <el-tab-pane label="学生联系人" name="studentContact">
+                  <StudentContactForm ref="studentContactFormRef" :student-id="formData.id" />
+                </el-tab-pane>
+                <el-tab-pane label="学生班主任" name="studentTeacher">
+                  <StudentTeacherForm ref="studentTeacherFormRef" :student-id="formData.id" />
+                </el-tab-pane>
+          </el-tabs>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+  import ImageUpload from '@/components/ImageUpload';
+  import FileUpload from '@/components/FileUpload';
+  import Editor from '@/components/Editor';
+          import StudentContactForm from './components/StudentContactForm.vue'
+      import StudentTeacherForm from './components/StudentTeacherForm.vue'
+  export default {
+    name: "StudentForm",
+    components: {
+          ImageUpload,
+          FileUpload,
+          Editor,
+                               StudentContactForm,
+               StudentTeacherForm,
+    },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+                            id: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        },
+        // 表单校验
+        formRules: {
+                        name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
+                        description: [{ required: true, message: '简介不能为空', trigger: 'blur' }],
+                        birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
+                        sex: [{ required: true, message: '性别不能为空', trigger: 'change' }],
+                        enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }],
+                        avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }],
+                        video: [{ required: true, message: '附件不能为空', trigger: 'blur' }],
+                        memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+        },
+                              /** 子表的表单 */
+             subTabsName: 'studentContact'
+      };
+    },
+    methods: {
+      /** 打开弹窗 */
+     open(id) {
+        this.dialogVisible = true;
+        this.reset();
+        const that = this;
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+            StudentApi.getStudent(id).then(res=>{
+              that.formData = res.data;
+              that.title = "修改学生";
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.title = "新增学生";
+              },
+      /** 提交按钮 */
+      submitForm() {
+        this.formLoading = true;
+        try {
+          const that = this;
+          let data = this.formData;
+          let validate = false;
+          // 校验主表
+          this.getRef("formRef").validate(valid => {
+            validate = valid;
+          });
+                    // 校验子表
+            this.validateSubFrom01().then(() => {
+            // 全部校验通过-拼接子表的数据
+            // 拼接子表的数据
+                data.studentContacts = that.getRef('studentContactFormRef').getData();
+                data.studentTeacher = that.getRef('studentTeacherFormRef').getData();
+            }).catch((err) => {
+                validate = false;
+                that.subTabsName = err.replace("FormRef", ""); // 定位到没有校验通过的子表单
+            })
+          // 所有表单校验通过后方可提交
+          if (!validate) {
+            return;
+          }
+          // 修改的提交
+          if (data.id) {
+                  StudentApi.updateStudent(data).then(response => {
+              that.$modal.msgSuccess("修改成功");
+              that.dialogVisible = false;
+              that.$emit('success');
+            });
+            return;
+          }
+          // 添加的提交
+          StudentApi.createStudent(data).then(response => {
+            that.$modal.msgSuccess("新增成功");
+            that.dialogVisible = false;
+            that.$emit('success');
+          });
+        }finally {
+          this.formLoading = false;
+        }
+      },
+      getRef(refName){
+        return this.$refs[refName];
+      },
+      /** 校验子表单 */
+      validateSubFrom(item) {
+        return new Promise((resolve, reject) => {
+          this.getRef(item).validate()
+          .then(() => {
+            resolve();
+          })
+          .catch(() => {
+            reject(item);
+          })
+        })
+      },
+      /** 校验所有子表单 */
+      validateSubFrom01() {
+        // 需要校验的表单 ref
+        const validFormRefArr = [
+              "studentContactFormRef",
+              "studentTeacherFormRef",
+        ];
+        const validArr = []; // 校验
+        for (const item of validFormRefArr) {
+          validArr.push(this.validateSubFrom(item));
+        }
+        return new Promise((resolve, reject) => {
+          // 校验所有
+          Promise.all(validArr).then(() => {
+            resolve();
+          }).catch((err) => {
+            reject(err);
+          })
+        })
+      },
+                      /** 表单重置 */
+      reset() {
+        this.formData = {
+                            id: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        };
+        this.resetForm("formRef");
+      },
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherForm
new file mode 100644
index 000000000..48d145bb7
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherForm
@@ -0,0 +1,126 @@
+<template>
+  <div class="app-container">
+      <el-form
+          ref="formRef"
+          :model="formData"
+          :rules="formRules"
+          label-width="100px"
+          v-loading="formLoading"
+      >
+                     <el-form-item label="名字" prop="name">
+                      <el-input v-model="formData.name" placeholder="请输入名字" />
+                    </el-form-item>
+                    <el-form-item label="简介" prop="description">
+                      <el-input v-model="formData.description" type="textarea" placeholder="请输入简介" />
+                    </el-form-item>
+                    <el-form-item label="出生日期" prop="birthday">
+                      <el-date-picker clearable v-model="formData.birthday" type="date" value-format="timestamp" placeholder="选择出生日期" />
+                    </el-form-item>
+                    <el-form-item label="性别" prop="sex">
+                      <el-select v-model="formData.sex" placeholder="请选择性别">
+                            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="是否有效" prop="enabled">
+                      <el-radio-group v-model="formData.enabled">
+                            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                                      :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="头像">
+                      <ImageUpload v-model="formData.avatar"/>
+                    </el-form-item>
+                    <el-form-item label="附件">
+                      <FileUpload v-model="formData.video"/>
+                    </el-form-item>
+                    <el-form-item label="备注">
+                      <Editor v-model="formData.memo" :min-height="192"/>
+                    </el-form-item>
+      </el-form>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+      import ImageUpload from '@/components/ImageUpload';
+      import FileUpload from '@/components/FileUpload';
+      import Editor from '@/components/Editor';
+  export default {
+    name: "StudentTeacherForm",
+    components: {
+          ImageUpload,
+          FileUpload,
+          Editor,
+    },
+    props:[
+      'studentId'
+    ],// 学生编号（主表的关联字段）
+    data() {
+      return {
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: [],
+        // 表单校验
+        formRules: {
+                        studentId: [{ required: true, message: "学生编号不能为空", trigger: "blur" }],
+                        name: [{ required: true, message: "名字不能为空", trigger: "blur" }],
+                        description: [{ required: true, message: "简介不能为空", trigger: "blur" }],
+                        birthday: [{ required: true, message: "出生日期不能为空", trigger: "blur" }],
+                        sex: [{ required: true, message: "性别不能为空", trigger: "change" }],
+                        enabled: [{ required: true, message: "是否有效不能为空", trigger: "blur" }],
+                        avatar: [{ required: true, message: "头像不能为空", trigger: "blur" }],
+                        memo: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        },
+      };
+    },
+    watch:{/** 监听主表的关联字段的变化，加载对应的子表数据 */
+      studentId:{
+        handler(val) {
+          // 1. 重置表单
+              this.formData = {
+                                  id: undefined,
+                                  studentId: undefined,
+                                  name: undefined,
+                                  description: undefined,
+                                  birthday: undefined,
+                                  sex: undefined,
+                                  enabled: undefined,
+                                  avatar: undefined,
+                                  video: undefined,
+                                  memo: undefined,
+              }
+          // 2. val 非空，则加载数据
+          if (!val) {
+            return;
+          }
+          try {
+            this.formLoading = true;
+            const that = this;
+            StudentApi.getStudentTeacherByStudentId(val).then(res=>{
+              const data = res.data;
+              if (!data) {
+                return
+              }
+              that.formData = data;
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        },
+        immediate: true
+      }
+    },
+    methods: {
+      /** 表单校验 */
+      validate(){
+        return this.$refs["formRef"].validate()
+      },
+      /** 表单值 */
+      getData(){
+        return this.formData
+      }
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherList
new file mode 100644
index 000000000..be77322a7
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherList
@@ -0,0 +1,95 @@
+<template>
+  <div class="app-container">
+            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+                <el-table-column label="编号" align="center" prop="id" />
+                 <el-table-column label="名字" align="center" prop="name" />
+                <el-table-column label="简介" align="center" prop="description" />
+                <el-table-column label="出生日期" align="center" prop="birthday" width="180">
+                  <template v-slot="scope">
+                    <span>{{ parseTime(scope.row.birthday) }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="性别" align="center" prop="sex">
+                  <template v-slot="scope">
+                    <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="是否有效" align="center" prop="enabled">
+                  <template v-slot="scope">
+                    <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
+                  </template>
+                </el-table-column>
+                <el-table-column label="头像" align="center" prop="avatar" />
+                <el-table-column label="附件" align="center" prop="video" />
+                <el-table-column label="备注" align="center" prop="memo" />
+                <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+                  <template v-slot="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                  </template>
+                </el-table-column>
+    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <template v-slot="scope">
+        <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                   v-hasPermi="['infra:student:update']">修改</el-button>
+        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                   v-hasPermi="['infra:student:delete']">删除</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+  export default {
+    name: "StudentTeacherList",
+    props:[
+      'studentId'
+    ],// 学生编号（主表的关联字段）
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 列表的数据
+        list: [],
+      };
+    },
+    created() {
+      this.getList();
+    },
+    watch:{/** 监听主表的关联字段的变化，加载对应的子表数据 */
+        studentId:{
+            handler(val) {
+              this.queryParams.studentId = val;
+              if (val){
+                this.handleQuery();
+              }
+            },
+            immediate: true
+      }
+    },
+    methods: {
+      /** 查询列表 */
+      getList() {
+        try {
+          this.loading = true;
+          const that = this;
+                StudentApi.getStudentTeacherByStudentId(this.studentId).then(response=>{
+                  const data = response.data;
+                  if (!data) {
+                    return
+                  }
+                  that.list.push(data)
+              })
+        } finally {
+          this.loading = false;
+        }
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNo = 1;
+        this.getList();
+      },
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/index
new file mode 100644
index 000000000..9787c5182
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/index
@@ -0,0 +1,230 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="名字" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入名字" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="出生日期" prop="birthday">
+        <el-date-picker clearable v-model="queryParams.birthday" type="date" value-format="yyyy-MM-dd" placeholder="选择出生日期" />
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否有效" prop="enabled">
+        <el-select v-model="queryParams.enabled" placeholder="请选择是否有效" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['infra:student:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['infra:student:export']">导出</el-button>
+      </el-col>
+              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+              <!-- 子表的列表 -->
+        <el-table-column type="expand">
+          <template #default="scope">
+            <el-tabs value="studentContact">
+                  <el-tab-pane label="学生联系人" name="studentContact">
+                    <StudentContactList :student-id="scope.row.id" />
+                  </el-tab-pane>
+                  <el-tab-pane label="学生班主任" name="studentTeacher">
+                    <StudentTeacherList :student-id="scope.row.id" />
+                  </el-tab-pane>
+            </el-tabs>
+          </template>
+        </el-table-column>
+      <el-table-column label="编号" align="center" prop="id">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.id" />
+        </template>
+      </el-table-column>
+      <el-table-column label="名字" align="center" prop="name">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.name" />
+        </template>
+      </el-table-column>
+      <el-table-column label="简介" align="center" prop="description">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.description" />
+        </template>
+      </el-table-column>
+      <el-table-column label="出生日期" align="center" prop="birthday" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.birthday) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" align="center" prop="sex">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否有效" align="center" prop="enabled">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
+        </template>
+      </el-table-column>
+      <el-table-column label="头像" align="center" prop="avatar">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.avatar" />
+        </template>
+      </el-table-column>
+      <el-table-column label="附件" align="center" prop="video">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.video" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="memo">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.memo" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['infra:student:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['infra:student:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 对话框(添加 / 修改) -->
+    <StudentForm ref="formRef" @success="getList" />
+    </div>
+</template>
+
+<script>
+import * as StudentApi from '@/api/infra/demo';
+import StudentForm from './StudentForm.vue';
+    import StudentContactList from './components/StudentContactList.vue'
+    import StudentTeacherList from './components/StudentTeacherList.vue'
+export default {
+  name: "Student",
+  components: {
+          StudentForm,
+          StudentContactList,
+          StudentTeacherList,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+              // 总条数
+        total: 0,
+      // 学生列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+                    pageNo: 1,
+            pageSize: 10,
+        name: null,
+        birthday: null,
+        sex: null,
+        enabled: null,
+        createTime: [],
+      },
+            };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      try {
+      this.loading = true;
+            StudentApi.getStudentPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+      });
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const that = this;
+      try {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
+          return StudentApi.deleteStudent(id);
+        }).then(() => {
+        that.getList();
+        that.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      } catch {}
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const that = this;
+      try {
+          this.$modal.confirm('是否确认导出所有学生数据项?').then(() => {
+              that.exportLoading = true;
+              return StudentApi.exportStudentExcel(params);
+            }).then(response => {
+              that.$download.excel(response, '学生.xls');
+            });
+      } catch {
+      } finally {
+        that.exportLoading = false;
+      }
+    },
+              }
+};
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/xml/InfraStudentMapper
new file mode 100644
index 000000000..155aa5c27
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/xml/InfraStudentMapper
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/assert.json
new file mode 100644
index 000000000..844cc753c
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/assert.json
@@ -0,0 +1,67 @@
+[ {
+  "contentPath" : "java/InfraStudentPageReqVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentPageReqVO.java"
+}, {
+  "contentPath" : "java/InfraStudentRespVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentRespVO.java"
+}, {
+  "contentPath" : "java/InfraStudentSaveReqVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentSaveReqVO.java"
+}, {
+  "contentPath" : "java/InfraStudentController",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/InfraStudentController.java"
+}, {
+  "contentPath" : "java/InfraStudentDO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentDO.java"
+}, {
+  "contentPath" : "java/InfraStudentContactDO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentContactDO.java"
+}, {
+  "contentPath" : "java/InfraStudentTeacherDO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentTeacherDO.java"
+}, {
+  "contentPath" : "java/InfraStudentMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentMapper.java"
+}, {
+  "contentPath" : "java/InfraStudentContactMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentContactMapper.java"
+}, {
+  "contentPath" : "java/InfraStudentTeacherMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentTeacherMapper.java"
+}, {
+  "contentPath" : "xml/InfraStudentMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/demo/InfraStudentMapper.xml"
+}, {
+  "contentPath" : "java/InfraStudentServiceImpl",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentServiceImpl.java"
+}, {
+  "contentPath" : "java/InfraStudentService",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentService.java"
+}, {
+  "contentPath" : "java/InfraStudentServiceImplTest",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentServiceImplTest.java"
+}, {
+  "contentPath" : "java/ErrorCodeConstants_手动操作",
+  "filePath" : "yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants_手动操作.java"
+}, {
+  "contentPath" : "sql/sql",
+  "filePath" : "sql/sql.sql"
+}, {
+  "contentPath" : "sql/h2",
+  "filePath" : "sql/h2.sql"
+}, {
+  "contentPath" : "vue/index",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue"
+}, {
+  "contentPath" : "js/student",
+  "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js"
+}, {
+  "contentPath" : "vue/StudentForm",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue"
+}, {
+  "contentPath" : "vue/StudentContactForm",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/components/StudentContactForm.vue"
+}, {
+  "contentPath" : "vue/StudentTeacherForm",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/components/StudentTeacherForm.vue"
+} ]
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/ErrorCodeConstants_手动操作
new file mode 100644
index 000000000..f8be66202
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/ErrorCodeConstants_手动操作
@@ -0,0 +1,3 @@
+// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！
+// ========== 学生 TODO 补充编号 ==========
+ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在");
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactDO
new file mode 100644
index 000000000..17c668eaa
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactDO
@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.infra.dal.dataobject.demo;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 学生联系人 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("infra_student_contact")
+@KeySequence("infra_student_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfraStudentContactDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 学生编号
+     */
+    private Long studentId;
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 简介
+     */
+    private String description;
+    /**
+     * 出生日期
+     */
+    private LocalDateTime birthday;
+    /**
+     * 性别
+     *
+     * 枚举 {@link TODO system_user_sex 对应的类}
+     */
+    private Integer sex;
+    /**
+     * 是否有效
+     *
+     * 枚举 {@link TODO infra_boolean_string 对应的类}
+     */
+    private Boolean enabled;
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 附件
+     */
+    private String video;
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactMapper
new file mode 100644
index 000000000..35bbd53c2
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactMapper
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.infra.dal.mysql.demo;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 学生联系人 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfraStudentContactMapper extends BaseMapperX<InfraStudentContactDO> {
+
+    default List<InfraStudentContactDO> selectListByStudentId(Long studentId) {
+        return selectList(InfraStudentContactDO::getStudentId, studentId);
+    }
+
+    default int deleteByStudentId(Long studentId) {
+        return delete(InfraStudentContactDO::getStudentId, studentId);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentController
new file mode 100644
index 000000000..b9a587b44
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentController
@@ -0,0 +1,117 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import cn.iocoder.yudao.module.infra.service.demo.InfraStudentService;
+
+@Tag(name = "管理后台 - 学生")
+@RestController
+@RequestMapping("/infra/student")
+@Validated
+public class InfraStudentController {
+
+    @Resource
+    private InfraStudentService studentService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建学生")
+    @PreAuthorize("@ss.hasPermission('infra:student:create')")
+    public CommonResult<Long> createStudent(@Valid @RequestBody InfraStudentSaveReqVO createReqVO) {
+        return success(studentService.createStudent(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新学生")
+    @PreAuthorize("@ss.hasPermission('infra:student:update')")
+    public CommonResult<Boolean> updateStudent(@Valid @RequestBody InfraStudentSaveReqVO updateReqVO) {
+        studentService.updateStudent(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除学生")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('infra:student:delete')")
+    public CommonResult<Boolean> deleteStudent(@RequestParam("id") Long id) {
+        studentService.deleteStudent(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得学生")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<InfraStudentRespVO> getStudent(@RequestParam("id") Long id) {
+        InfraStudentDO student = studentService.getStudent(id);
+        return success(BeanUtils.toBean(student, InfraStudentRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得学生分页")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<PageResult<InfraStudentRespVO>> getStudentPage(@Valid InfraStudentPageReqVO pageReqVO) {
+        PageResult<InfraStudentDO> pageResult = studentService.getStudentPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, InfraStudentRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出学生 Excel")
+    @PreAuthorize("@ss.hasPermission('infra:student:export')")
+    @OperateLog(type = EXPORT)
+    public void exportStudentExcel(@Valid InfraStudentPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<InfraStudentDO> list = studentService.getStudentPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "学生.xls", "数据", InfraStudentRespVO.class,
+                        BeanUtils.toBean(list, InfraStudentRespVO.class));
+    }
+
+    // ==================== 子表（学生联系人） ====================
+
+    @GetMapping("/student-contact/list-by-student-id")
+    @Operation(summary = "获得学生联系人列表")
+    @Parameter(name = "studentId", description = "学生编号")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<List<InfraStudentContactDO>> getStudentContactListByStudentId(@RequestParam("studentId") Long studentId) {
+        return success(studentService.getStudentContactListByStudentId(studentId));
+    }
+
+    // ==================== 子表（学生班主任） ====================
+
+    @GetMapping("/student-teacher/get-by-student-id")
+    @Operation(summary = "获得学生班主任")
+    @Parameter(name = "studentId", description = "学生编号")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<InfraStudentTeacherDO> getStudentTeacherByStudentId(@RequestParam("studentId") Long studentId) {
+        return success(studentService.getStudentTeacherByStudentId(studentId));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentDO
new file mode 100644
index 000000000..b0d4bd216
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentDO
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.infra.dal.dataobject.demo;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 学生 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("infra_student")
+@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfraStudentDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 简介
+     */
+    private String description;
+    /**
+     * 出生日期
+     */
+    private LocalDateTime birthday;
+    /**
+     * 性别
+     *
+     * 枚举 {@link TODO system_user_sex 对应的类}
+     */
+    private Integer sex;
+    /**
+     * 是否有效
+     *
+     * 枚举 {@link TODO infra_boolean_string 对应的类}
+     */
+    private Boolean enabled;
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 附件
+     */
+    private String video;
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentMapper
new file mode 100644
index 000000000..34e70a082
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentMapper
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.infra.dal.mysql.demo;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+
+/**
+ * 学生 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfraStudentMapper extends BaseMapperX<InfraStudentDO> {
+
+    default PageResult<InfraStudentDO> selectPage(InfraStudentPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<InfraStudentDO>()
+                .likeIfPresent(InfraStudentDO::getName, reqVO.getName())
+                .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday())
+                .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex())
+                .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled())
+                .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(InfraStudentDO::getId));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentPageReqVO
new file mode 100644
index 000000000..41a373012
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentPageReqVO
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 学生分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class InfraStudentPageReqVO extends PageParam {
+
+    @Schema(description = "名字", example = "芋头")
+    private String name;
+
+    @Schema(description = "出生日期")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", example = "1")
+    private Integer sex;
+
+    @Schema(description = "是否有效", example = "true")
+    private Boolean enabled;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentRespVO
new file mode 100644
index 000000000..c41a5501f
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentRespVO
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 学生 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class InfraStudentRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @ExcelProperty("编号")
+    private Long id;
+
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋头")
+    @ExcelProperty("名字")
+    private String name;
+
+    @Schema(description = "简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是介绍")
+    @ExcelProperty("简介")
+    private String description;
+
+    @Schema(description = "出生日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("出生日期")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty(value = "性别", converter = DictConvert.class)
+    @DictFormat("system_user_sex") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer sex;
+
+    @Schema(description = "是否有效", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @ExcelProperty(value = "是否有效", converter = DictConvert.class)
+    @DictFormat("infra_boolean_string") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Boolean enabled;
+
+    @Schema(description = "头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png")
+    @ExcelProperty("头像")
+    private String avatar;
+
+    @Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.mp4")
+    @ExcelProperty("附件")
+    private String video;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是备注")
+    @ExcelProperty("备注")
+    private String memo;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentSaveReqVO
new file mode 100644
index 000000000..faa491dfb
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentSaveReqVO
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+
+@Schema(description = "管理后台 - 学生新增/修改 Request VO")
+@Data
+public class InfraStudentSaveReqVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋头")
+    @NotEmpty(message = "名字不能为空")
+    private String name;
+
+    @Schema(description = "简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是介绍")
+    @NotEmpty(message = "简介不能为空")
+    private String description;
+
+    @Schema(description = "出生日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "出生日期不能为空")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "性别不能为空")
+    private Integer sex;
+
+    @Schema(description = "是否有效", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @NotNull(message = "是否有效不能为空")
+    private Boolean enabled;
+
+    @Schema(description = "头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png")
+    @NotEmpty(message = "头像不能为空")
+    private String avatar;
+
+    @Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.mp4")
+    @NotEmpty(message = "附件不能为空")
+    private String video;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是备注")
+    @NotEmpty(message = "备注不能为空")
+    private String memo;
+
+    @Schema(description = "学生联系人列表")
+    private List<InfraStudentContactDO> studentContacts;
+
+    @Schema(description = "学生班主任")
+    private InfraStudentTeacherDO studentTeacher;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentService
new file mode 100644
index 000000000..afa7d22eb
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentService
@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+/**
+ * 学生 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface InfraStudentService {
+
+    /**
+     * 创建学生
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createStudent(@Valid InfraStudentSaveReqVO createReqVO);
+
+    /**
+     * 更新学生
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateStudent(@Valid InfraStudentSaveReqVO updateReqVO);
+
+    /**
+     * 删除学生
+     *
+     * @param id 编号
+     */
+    void deleteStudent(Long id);
+
+    /**
+     * 获得学生
+     *
+     * @param id 编号
+     * @return 学生
+     */
+    InfraStudentDO getStudent(Long id);
+
+    /**
+     * 获得学生分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 学生分页
+     */
+    PageResult<InfraStudentDO> getStudentPage(InfraStudentPageReqVO pageReqVO);
+
+    // ==================== 子表（学生联系人） ====================
+
+    /**
+     * 获得学生联系人列表
+     *
+     * @param studentId 学生编号
+     * @return 学生联系人列表
+     */
+    List<InfraStudentContactDO> getStudentContactListByStudentId(Long studentId);
+
+    // ==================== 子表（学生班主任） ====================
+
+    /**
+     * 获得学生班主任
+     *
+     * @param studentId 学生编号
+     * @return 学生班主任
+     */
+    InfraStudentTeacherDO getStudentTeacherByStudentId(Long studentId);
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl
new file mode 100644
index 000000000..c57cba613
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl
@@ -0,0 +1,147 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper;
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentContactMapper;
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentTeacherMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
+
+/**
+ * 学生 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class InfraStudentServiceImpl implements InfraStudentService {
+
+    @Resource
+    private InfraStudentMapper studentMapper;
+    @Resource
+    private InfraStudentContactMapper studentContactMapper;
+    @Resource
+    private InfraStudentTeacherMapper studentTeacherMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long createStudent(InfraStudentSaveReqVO createReqVO) {
+        // 插入
+        InfraStudentDO student = BeanUtils.toBean(createReqVO, InfraStudentDO.class);
+        studentMapper.insert(student);
+
+        // 插入子表
+        createStudentContactList(student.getId(), createReqVO.getStudentContacts());
+        createStudentTeacher(student.getId(), createReqVO.getStudentTeacher());
+        // 返回
+        return student.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateStudent(InfraStudentSaveReqVO updateReqVO) {
+        // 校验存在
+        validateStudentExists(updateReqVO.getId());
+        // 更新
+        InfraStudentDO updateObj = BeanUtils.toBean(updateReqVO, InfraStudentDO.class);
+        studentMapper.updateById(updateObj);
+
+        // 更新子表
+        updateStudentContactList(updateReqVO.getId(), updateReqVO.getStudentContacts());
+        updateStudentTeacher(updateReqVO.getId(), updateReqVO.getStudentTeacher());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteStudent(Long id) {
+        // 校验存在
+        validateStudentExists(id);
+        // 删除
+        studentMapper.deleteById(id);
+
+        // 删除子表
+        deleteStudentContactByStudentId(id);
+        deleteStudentTeacherByStudentId(id);
+    }
+
+    private void validateStudentExists(Long id) {
+        if (studentMapper.selectById(id) == null) {
+            throw exception(STUDENT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public InfraStudentDO getStudent(Long id) {
+        return studentMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<InfraStudentDO> getStudentPage(InfraStudentPageReqVO pageReqVO) {
+        return studentMapper.selectPage(pageReqVO);
+    }
+
+    // ==================== 子表（学生联系人） ====================
+
+    @Override
+    public List<InfraStudentContactDO> getStudentContactListByStudentId(Long studentId) {
+        return studentContactMapper.selectListByStudentId(studentId);
+    }
+
+    private void createStudentContactList(Long studentId, List<InfraStudentContactDO> list) {
+        list.forEach(o -> o.setStudentId(studentId));
+        studentContactMapper.insertBatch(list);
+    }
+
+    private void updateStudentContactList(Long studentId, List<InfraStudentContactDO> list) {
+        deleteStudentContactByStudentId(studentId);
+		list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
+        createStudentContactList(studentId, list);
+    }
+
+    private void deleteStudentContactByStudentId(Long studentId) {
+        studentContactMapper.deleteByStudentId(studentId);
+    }
+
+    // ==================== 子表（学生班主任） ====================
+
+    @Override
+    public InfraStudentTeacherDO getStudentTeacherByStudentId(Long studentId) {
+        return studentTeacherMapper.selectByStudentId(studentId);
+    }
+
+    private void createStudentTeacher(Long studentId, InfraStudentTeacherDO studentTeacher) {
+        if (studentTeacher == null) {
+            return;
+        }
+        studentTeacher.setStudentId(studentId);
+        studentTeacherMapper.insert(studentTeacher);
+    }
+
+    private void updateStudentTeacher(Long studentId, InfraStudentTeacherDO studentTeacher) {
+        if (studentTeacher == null) {
+			return;
+        }
+        studentTeacher.setStudentId(studentId);
+        studentTeacher.setUpdater(null).setUpdateTime(null); // 解决更新情况下：updateTime 不更新
+        studentTeacherMapper.insertOrUpdate(studentTeacher);
+    }
+
+    private void deleteStudentTeacherByStudentId(Long studentId) {
+        studentTeacherMapper.deleteByStudentId(studentId);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImplTest
new file mode 100644
index 000000000..b5f4bf0ff
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImplTest
@@ -0,0 +1,146 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import javax.annotation.Resource;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import javax.annotation.Resource;
+import org.springframework.context.annotation.Import;
+import java.util.*;
+import java.time.LocalDateTime;
+
+import static cn.hutool.core.util.RandomUtil.*;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+/**
+ * {@link InfraStudentServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(InfraStudentServiceImpl.class)
+public class InfraStudentServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private InfraStudentServiceImpl studentService;
+
+    @Resource
+    private InfraStudentMapper studentMapper;
+
+    @Test
+    public void testCreateStudent_success() {
+        // 准备参数
+        InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null);
+
+        // 调用
+        Long studentId = studentService.createStudent(createReqVO);
+        // 断言
+        assertNotNull(studentId);
+        // 校验记录的属性是否正确
+        InfraStudentDO student = studentMapper.selectById(studentId);
+        assertPojoEquals(createReqVO, student, "id");
+    }
+
+    @Test
+    public void testUpdateStudent_success() {
+        // mock 数据
+        InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class);
+        studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> {
+            o.setId(dbStudent.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        studentService.updateStudent(updateReqVO);
+        // 校验是否更新正确
+        InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的
+        assertPojoEquals(updateReqVO, student);
+    }
+
+    @Test
+    public void testUpdateStudent_notExists() {
+        // 准备参数
+        InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteStudent_success() {
+        // mock 数据
+        InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class);
+        studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbStudent.getId();
+
+        // 调用
+        studentService.deleteStudent(id);
+       // 校验数据不存在了
+       assertNull(studentMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteStudent_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS);
+    }
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
+    public void testGetStudentPage() {
+       // mock 数据
+       InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到
+           o.setName(null);
+           o.setBirthday(null);
+           o.setSex(null);
+           o.setEnabled(null);
+           o.setCreateTime(null);
+       });
+       studentMapper.insert(dbStudent);
+       // 测试 name 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null)));
+       // 测试 birthday 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null)));
+       // 测试 sex 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null)));
+       // 测试 enabled 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null)));
+       // 测试 createTime 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null)));
+       // 准备参数
+       InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO();
+       reqVO.setName(null);
+       reqVO.setBirthday(null);
+       reqVO.setSex(null);
+       reqVO.setEnabled(null);
+       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+
+       // 调用
+       PageResult<InfraStudentDO> pageResult = studentService.getStudentPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbStudent, pageResult.getList().get(0));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherDO
new file mode 100644
index 000000000..c19cf9fab
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherDO
@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.infra.dal.dataobject.demo;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 学生班主任 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("infra_student_teacher")
+@KeySequence("infra_student_teacher_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfraStudentTeacherDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 学生编号
+     */
+    private Long studentId;
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 简介
+     */
+    private String description;
+    /**
+     * 出生日期
+     */
+    private LocalDateTime birthday;
+    /**
+     * 性别
+     *
+     * 枚举 {@link TODO system_user_sex 对应的类}
+     */
+    private Integer sex;
+    /**
+     * 是否有效
+     *
+     * 枚举 {@link TODO infra_boolean_string 对应的类}
+     */
+    private Boolean enabled;
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 附件
+     */
+    private String video;
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherMapper
new file mode 100644
index 000000000..0521bbaf4
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherMapper
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.infra.dal.mysql.demo;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 学生班主任 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfraStudentTeacherMapper extends BaseMapperX<InfraStudentTeacherDO> {
+
+    default InfraStudentTeacherDO selectByStudentId(Long studentId) {
+        return selectOne(InfraStudentTeacherDO::getStudentId, studentId);
+    }
+
+    default int deleteByStudentId(Long studentId) {
+        return delete(InfraStudentTeacherDO::getStudentId, studentId);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/js/student b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/js/student
new file mode 100644
index 000000000..b4e6ac5e4
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/js/student
@@ -0,0 +1,74 @@
+import request from '@/utils/request'
+
+// 创建学生
+export function createStudent(data) {
+  return request({
+    url: '/infra/student/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新学生
+export function updateStudent(data) {
+  return request({
+    url: '/infra/student/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除学生
+export function deleteStudent(id) {
+  return request({
+    url: '/infra/student/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得学生
+export function getStudent(id) {
+  return request({
+    url: '/infra/student/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得学生分页
+export function getStudentPage(params) {
+  return request({
+    url: '/infra/student/page',
+    method: 'get',
+    params
+  })
+}
+// 导出学生 Excel
+export function exportStudentExcel(params) {
+  return request({
+    url: '/infra/student/export-excel',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
+
+// ==================== 子表（学生联系人） ====================
+  
+    // 获得学生联系人列表
+    export function getStudentContactListByStudentId(studentId) {
+      return request({
+        url: `/infra/student/student-contact/list-by-student-id?studentId=` + studentId,
+        method: 'get'
+      })
+    }
+  
+// ==================== 子表（学生班主任） ====================
+  
+    // 获得学生班主任
+    export function getStudentTeacherByStudentId(studentId) {
+      return request({
+        url: `/infra/student/student-teacher/get-by-student-id?studentId=` + studentId,
+        method: 'get'
+      })
+    }
+  
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/h2
new file mode 100644
index 000000000..6c1875f60
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/h2
@@ -0,0 +1,17 @@
+-- 将该建表 SQL 语句，添加到 yudao-module-infra-biz 模块的 test/resources/sql/create_tables.sql 文件里
+CREATE TABLE IF NOT EXISTS "infra_student" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "name" varchar NOT NULL,
+    "description" varchar NOT NULL,
+    "birthday" varchar NOT NULL,
+    "sex" int NOT NULL,
+    "enabled" bit NOT NULL,
+    "avatar" varchar NOT NULL,
+    "video" varchar NOT NULL,
+    "memo" varchar NOT NULL,
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY ("id")
+) COMMENT '学生表';
+
+-- 将该删表 SQL 语句，添加到 yudao-module-infra-biz 模块的 test/resources/sql/clean.sql 文件里
+DELETE FROM "infra_student";
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/sql
new file mode 100644
index 000000000..83df27926
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/sql
@@ -0,0 +1,55 @@
+-- 菜单 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status, component_name
+)
+VALUES (
+    '学生管理', '', 2, 0, 888,
+    'student', '', 'infra/demo/index', 0, 'InfraStudent'
+);
+
+-- 按钮父菜单ID
+-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生查询', 'infra:student:query', 3, 1, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生创建', 'infra:student:create', 3, 2, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生更新', 'infra:student:update', 3, 3, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生删除', 'infra:student:delete', 3, 4, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生导出', 'infra:student:export', 3, 5, @parentId,
+    '', '', '', 0
+);
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentContactForm
new file mode 100644
index 000000000..1e57837a4
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentContactForm
@@ -0,0 +1,176 @@
+<template>
+  <div class="app-container">
+      <el-form
+          ref="formRef"
+          :model="formData"
+          :rules="formRules"
+          v-loading="formLoading"
+          label-width="0px"
+          :inline-message="true"
+      >
+        <el-table :data="formData" class="-mt-10px">
+          <el-table-column label="序号" type="index" width="100" />
+                       <el-table-column label="名字" min-width="150">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.name`" :rules="formRules.name" class="mb-0px!">
+                            <el-input v-model="row.name" placeholder="请输入名字" />
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="简介" min-width="200">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.description`" :rules="formRules.description" class="mb-0px!">
+                            <el-input v-model="row.description" type="textarea" placeholder="请输入简介" />
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="出生日期" min-width="150">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.birthday`" :rules="formRules.birthday" class="mb-0px!">
+                            <el-date-picker clearable v-model="row.birthday" type="date" value-format="timestamp" placeholder="选择出生日期" />
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="性别" min-width="150">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.sex`" :rules="formRules.sex" class="mb-0px!">
+                            <el-select v-model="row.sex" placeholder="请选择性别">
+                                  <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                                             :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                            </el-select>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="是否有效" min-width="150">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.enabled`" :rules="formRules.enabled" class="mb-0px!">
+                            <el-radio-group v-model="row.enabled">
+                                  <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                                            :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+                            </el-radio-group>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="头像" min-width="200">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.avatar`" :rules="formRules.avatar" class="mb-0px!">
+                            <ImageUpload v-model="row.avatar"/>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="附件" min-width="200">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.video`" :rules="formRules.video" class="mb-0px!">
+                            <FileUpload v-model="row.video"/>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="备注" min-width="400">
+                        <template v-slot="{ row, $index }">
+                          <el-form-item :prop="`${$index}.memo`" :rules="formRules.memo" class="mb-0px!">
+                            <Editor v-model="row.memo" :min-height="192"/>
+                          </el-form-item>
+                        </template>
+                      </el-table-column>
+          <el-table-column align="center" fixed="right" label="操作" width="60">
+            <template v-slot="{ $index }">
+              <el-link @click="handleDelete($index)">—</el-link>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <el-row justify="center" class="mt-3">
+        <el-button @click="handleAdd" round>+ 添加学生联系人</el-button>
+      </el-row>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+      import ImageUpload from '@/components/ImageUpload';
+      import FileUpload from '@/components/FileUpload';
+      import Editor from '@/components/Editor';
+  export default {
+    name: "StudentContactForm",
+    components: {
+          ImageUpload,
+          FileUpload,
+          Editor,
+    },
+    props:[
+      'studentId'
+    ],// 学生编号（主表的关联字段）
+    data() {
+      return {
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: [],
+        // 表单校验
+        formRules: {
+                        studentId: [{ required: true, message: "学生编号不能为空", trigger: "blur" }],
+                        name: [{ required: true, message: "名字不能为空", trigger: "blur" }],
+                        description: [{ required: true, message: "简介不能为空", trigger: "blur" }],
+                        birthday: [{ required: true, message: "出生日期不能为空", trigger: "blur" }],
+                        sex: [{ required: true, message: "性别不能为空", trigger: "change" }],
+                        enabled: [{ required: true, message: "是否有效不能为空", trigger: "blur" }],
+                        avatar: [{ required: true, message: "头像不能为空", trigger: "blur" }],
+                        memo: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        },
+      };
+    },
+    watch:{/** 监听主表的关联字段的变化，加载对应的子表数据 */
+      studentId:{
+        handler(val) {
+          // 1. 重置表单
+              this.formData = []
+          // 2. val 非空，则加载数据
+          if (!val) {
+            return;
+          }
+          try {
+            this.formLoading = true;
+            const that = this;
+            StudentApi.getStudentContactListByStudentId(val).then(res=>{
+              that.formData = res.data;
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        },
+        immediate: true
+      }
+    },
+    methods: {
+          /** 新增按钮操作 */
+          handleAdd() {
+            const row = {
+                                id: undefined,
+                                studentId: undefined,
+                                name: undefined,
+                                description: undefined,
+                                birthday: undefined,
+                                sex: undefined,
+                                enabled: undefined,
+                                avatar: undefined,
+                                video: undefined,
+                                memo: undefined,
+            }
+            row.studentId = this.studentId
+            this.formData.push(row)
+          },
+          /** 删除按钮操作 */
+          handleDelete(index) {
+            this.formData.splice(index, 1)
+          },
+      /** 表单校验 */
+      validate(){
+        return this.$refs["formRef"].validate()
+      },
+      /** 表单值 */
+      getData(){
+        return this.formData
+      }
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentForm
new file mode 100644
index 000000000..140db4beb
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentForm
@@ -0,0 +1,221 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+                    <el-form-item label="名字" prop="name">
+                      <el-input v-model="formData.name" placeholder="请输入名字" />
+                    </el-form-item>
+                    <el-form-item label="简介" prop="description">
+                      <el-input v-model="formData.description" type="textarea" placeholder="请输入内容" />
+                    </el-form-item>
+                    <el-form-item label="出生日期" prop="birthday">
+                      <el-date-picker clearable v-model="formData.birthday" type="date" value-format="timestamp" placeholder="选择出生日期" />
+                    </el-form-item>
+                    <el-form-item label="性别" prop="sex">
+                      <el-select v-model="formData.sex" placeholder="请选择性别">
+                            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="是否有效" prop="enabled">
+                      <el-radio-group v-model="formData.enabled">
+                            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                                      :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="头像">
+                      <ImageUpload v-model="formData.avatar"/>
+                    </el-form-item>
+                    <el-form-item label="附件">
+                      <FileUpload v-model="formData.video"/>
+                    </el-form-item>
+                    <el-form-item label="备注">
+                      <Editor v-model="formData.memo" :min-height="192"/>
+                    </el-form-item>
+      </el-form>
+                  <!-- 子表的表单 -->
+          <el-tabs v-model="subTabsName">
+                <el-tab-pane label="学生联系人" name="studentContact">
+                  <StudentContactForm ref="studentContactFormRef" :student-id="formData.id" />
+                </el-tab-pane>
+                <el-tab-pane label="学生班主任" name="studentTeacher">
+                  <StudentTeacherForm ref="studentTeacherFormRef" :student-id="formData.id" />
+                </el-tab-pane>
+          </el-tabs>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+  import ImageUpload from '@/components/ImageUpload';
+  import FileUpload from '@/components/FileUpload';
+  import Editor from '@/components/Editor';
+          import StudentContactForm from './components/StudentContactForm.vue'
+      import StudentTeacherForm from './components/StudentTeacherForm.vue'
+  export default {
+    name: "StudentForm",
+    components: {
+          ImageUpload,
+          FileUpload,
+          Editor,
+                               StudentContactForm,
+               StudentTeacherForm,
+    },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+                            id: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        },
+        // 表单校验
+        formRules: {
+                        name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
+                        description: [{ required: true, message: '简介不能为空', trigger: 'blur' }],
+                        birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
+                        sex: [{ required: true, message: '性别不能为空', trigger: 'change' }],
+                        enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }],
+                        avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }],
+                        video: [{ required: true, message: '附件不能为空', trigger: 'blur' }],
+                        memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+        },
+                              /** 子表的表单 */
+             subTabsName: 'studentContact'
+      };
+    },
+    methods: {
+      /** 打开弹窗 */
+     open(id) {
+        this.dialogVisible = true;
+        this.reset();
+        const that = this;
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+            StudentApi.getStudent(id).then(res=>{
+              that.formData = res.data;
+              that.title = "修改学生";
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.title = "新增学生";
+              },
+      /** 提交按钮 */
+      submitForm() {
+        this.formLoading = true;
+        try {
+          const that = this;
+          let data = this.formData;
+          let validate = false;
+          // 校验主表
+          this.getRef("formRef").validate(valid => {
+            validate = valid;
+          });
+                    // 校验子表
+            this.validateSubFrom01().then(() => {
+            // 全部校验通过-拼接子表的数据
+            // 拼接子表的数据
+                data.studentContacts = that.getRef('studentContactFormRef').getData();
+                data.studentTeacher = that.getRef('studentTeacherFormRef').getData();
+            }).catch((err) => {
+                validate = false;
+                that.subTabsName = err.replace("FormRef", ""); // 定位到没有校验通过的子表单
+            })
+          // 所有表单校验通过后方可提交
+          if (!validate) {
+            return;
+          }
+          // 修改的提交
+          if (data.id) {
+                  StudentApi.updateStudent(data).then(response => {
+              that.$modal.msgSuccess("修改成功");
+              that.dialogVisible = false;
+              that.$emit('success');
+            });
+            return;
+          }
+          // 添加的提交
+          StudentApi.createStudent(data).then(response => {
+            that.$modal.msgSuccess("新增成功");
+            that.dialogVisible = false;
+            that.$emit('success');
+          });
+        }finally {
+          this.formLoading = false;
+        }
+      },
+      getRef(refName){
+        return this.$refs[refName];
+      },
+      /** 校验子表单 */
+      validateSubFrom(item) {
+        return new Promise((resolve, reject) => {
+          this.getRef(item).validate()
+          .then(() => {
+            resolve();
+          })
+          .catch(() => {
+            reject(item);
+          })
+        })
+      },
+      /** 校验所有子表单 */
+      validateSubFrom01() {
+        // 需要校验的表单 ref
+        const validFormRefArr = [
+              "studentContactFormRef",
+              "studentTeacherFormRef",
+        ];
+        const validArr = []; // 校验
+        for (const item of validFormRefArr) {
+          validArr.push(this.validateSubFrom(item));
+        }
+        return new Promise((resolve, reject) => {
+          // 校验所有
+          Promise.all(validArr).then(() => {
+            resolve();
+          }).catch((err) => {
+            reject(err);
+          })
+        })
+      },
+                      /** 表单重置 */
+      reset() {
+        this.formData = {
+                            id: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        };
+        this.resetForm("formRef");
+      },
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentTeacherForm
new file mode 100644
index 000000000..48d145bb7
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentTeacherForm
@@ -0,0 +1,126 @@
+<template>
+  <div class="app-container">
+      <el-form
+          ref="formRef"
+          :model="formData"
+          :rules="formRules"
+          label-width="100px"
+          v-loading="formLoading"
+      >
+                     <el-form-item label="名字" prop="name">
+                      <el-input v-model="formData.name" placeholder="请输入名字" />
+                    </el-form-item>
+                    <el-form-item label="简介" prop="description">
+                      <el-input v-model="formData.description" type="textarea" placeholder="请输入简介" />
+                    </el-form-item>
+                    <el-form-item label="出生日期" prop="birthday">
+                      <el-date-picker clearable v-model="formData.birthday" type="date" value-format="timestamp" placeholder="选择出生日期" />
+                    </el-form-item>
+                    <el-form-item label="性别" prop="sex">
+                      <el-select v-model="formData.sex" placeholder="请选择性别">
+                            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="是否有效" prop="enabled">
+                      <el-radio-group v-model="formData.enabled">
+                            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                                      :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="头像">
+                      <ImageUpload v-model="formData.avatar"/>
+                    </el-form-item>
+                    <el-form-item label="附件">
+                      <FileUpload v-model="formData.video"/>
+                    </el-form-item>
+                    <el-form-item label="备注">
+                      <Editor v-model="formData.memo" :min-height="192"/>
+                    </el-form-item>
+      </el-form>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+      import ImageUpload from '@/components/ImageUpload';
+      import FileUpload from '@/components/FileUpload';
+      import Editor from '@/components/Editor';
+  export default {
+    name: "StudentTeacherForm",
+    components: {
+          ImageUpload,
+          FileUpload,
+          Editor,
+    },
+    props:[
+      'studentId'
+    ],// 学生编号（主表的关联字段）
+    data() {
+      return {
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: [],
+        // 表单校验
+        formRules: {
+                        studentId: [{ required: true, message: "学生编号不能为空", trigger: "blur" }],
+                        name: [{ required: true, message: "名字不能为空", trigger: "blur" }],
+                        description: [{ required: true, message: "简介不能为空", trigger: "blur" }],
+                        birthday: [{ required: true, message: "出生日期不能为空", trigger: "blur" }],
+                        sex: [{ required: true, message: "性别不能为空", trigger: "change" }],
+                        enabled: [{ required: true, message: "是否有效不能为空", trigger: "blur" }],
+                        avatar: [{ required: true, message: "头像不能为空", trigger: "blur" }],
+                        memo: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        },
+      };
+    },
+    watch:{/** 监听主表的关联字段的变化，加载对应的子表数据 */
+      studentId:{
+        handler(val) {
+          // 1. 重置表单
+              this.formData = {
+                                  id: undefined,
+                                  studentId: undefined,
+                                  name: undefined,
+                                  description: undefined,
+                                  birthday: undefined,
+                                  sex: undefined,
+                                  enabled: undefined,
+                                  avatar: undefined,
+                                  video: undefined,
+                                  memo: undefined,
+              }
+          // 2. val 非空，则加载数据
+          if (!val) {
+            return;
+          }
+          try {
+            this.formLoading = true;
+            const that = this;
+            StudentApi.getStudentTeacherByStudentId(val).then(res=>{
+              const data = res.data;
+              if (!data) {
+                return
+              }
+              that.formData = data;
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        },
+        immediate: true
+      }
+    },
+    methods: {
+      /** 表单校验 */
+      validate(){
+        return this.$refs["formRef"].validate()
+      },
+      /** 表单值 */
+      getData(){
+        return this.formData
+      }
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/index
new file mode 100644
index 000000000..dfdf41b09
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/index
@@ -0,0 +1,213 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="名字" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入名字" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="出生日期" prop="birthday">
+        <el-date-picker clearable v-model="queryParams.birthday" type="date" value-format="yyyy-MM-dd" placeholder="选择出生日期" />
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否有效" prop="enabled">
+        <el-select v-model="queryParams.enabled" placeholder="请选择是否有效" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['infra:student:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['infra:student:export']">导出</el-button>
+      </el-col>
+              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+            <el-table-column label="编号" align="center" prop="id">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.id" />
+        </template>
+      </el-table-column>
+      <el-table-column label="名字" align="center" prop="name">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.name" />
+        </template>
+      </el-table-column>
+      <el-table-column label="简介" align="center" prop="description">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.description" />
+        </template>
+      </el-table-column>
+      <el-table-column label="出生日期" align="center" prop="birthday" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.birthday) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" align="center" prop="sex">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否有效" align="center" prop="enabled">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
+        </template>
+      </el-table-column>
+      <el-table-column label="头像" align="center" prop="avatar">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.avatar" />
+        </template>
+      </el-table-column>
+      <el-table-column label="附件" align="center" prop="video">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.video" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="memo">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.memo" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['infra:student:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['infra:student:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 对话框(添加 / 修改) -->
+    <StudentForm ref="formRef" @success="getList" />
+    </div>
+</template>
+
+<script>
+import * as StudentApi from '@/api/infra/demo';
+import StudentForm from './StudentForm.vue';
+export default {
+  name: "Student",
+  components: {
+          StudentForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+              // 总条数
+        total: 0,
+      // 学生列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+                    pageNo: 1,
+            pageSize: 10,
+        name: null,
+        birthday: null,
+        sex: null,
+        enabled: null,
+        createTime: [],
+      },
+            };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      try {
+      this.loading = true;
+            StudentApi.getStudentPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+      });
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const that = this;
+      try {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
+          return StudentApi.deleteStudent(id);
+        }).then(() => {
+        that.getList();
+        that.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      } catch {}
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const that = this;
+      try {
+          this.$modal.confirm('是否确认导出所有学生数据项?').then(() => {
+              that.exportLoading = true;
+              return StudentApi.exportStudentExcel(params);
+            }).then(response => {
+              that.$download.excel(response, '学生.xls');
+            });
+      } catch {
+      } finally {
+        that.exportLoading = false;
+      }
+    },
+              }
+};
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/xml/InfraStudentMapper
new file mode 100644
index 000000000..155aa5c27
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/xml/InfraStudentMapper
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/assert.json
new file mode 100644
index 000000000..ccb00a814
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/assert.json
@@ -0,0 +1,49 @@
+[ {
+  "contentPath" : "java/InfraStudentPageReqVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentPageReqVO.java"
+}, {
+  "contentPath" : "java/InfraStudentRespVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentRespVO.java"
+}, {
+  "contentPath" : "java/InfraStudentSaveReqVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentSaveReqVO.java"
+}, {
+  "contentPath" : "java/InfraStudentController",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/InfraStudentController.java"
+}, {
+  "contentPath" : "java/InfraStudentDO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentDO.java"
+}, {
+  "contentPath" : "java/InfraStudentMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentMapper.java"
+}, {
+  "contentPath" : "xml/InfraStudentMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/demo/InfraStudentMapper.xml"
+}, {
+  "contentPath" : "java/InfraStudentServiceImpl",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentServiceImpl.java"
+}, {
+  "contentPath" : "java/InfraStudentService",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentService.java"
+}, {
+  "contentPath" : "java/InfraStudentServiceImplTest",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentServiceImplTest.java"
+}, {
+  "contentPath" : "java/ErrorCodeConstants_手动操作",
+  "filePath" : "yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants_手动操作.java"
+}, {
+  "contentPath" : "sql/sql",
+  "filePath" : "sql/sql.sql"
+}, {
+  "contentPath" : "sql/h2",
+  "filePath" : "sql/h2.sql"
+}, {
+  "contentPath" : "vue/index",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue"
+}, {
+  "contentPath" : "js/student",
+  "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js"
+}, {
+  "contentPath" : "vue/StudentForm",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue"
+} ]
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/ErrorCodeConstants_手动操作
new file mode 100644
index 000000000..f8be66202
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/ErrorCodeConstants_手动操作
@@ -0,0 +1,3 @@
+// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！
+// ========== 学生 TODO 补充编号 ==========
+ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在");
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentController
new file mode 100644
index 000000000..3796982c4
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentController
@@ -0,0 +1,95 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.service.demo.InfraStudentService;
+
+@Tag(name = "管理后台 - 学生")
+@RestController
+@RequestMapping("/infra/student")
+@Validated
+public class InfraStudentController {
+
+    @Resource
+    private InfraStudentService studentService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建学生")
+    @PreAuthorize("@ss.hasPermission('infra:student:create')")
+    public CommonResult<Long> createStudent(@Valid @RequestBody InfraStudentSaveReqVO createReqVO) {
+        return success(studentService.createStudent(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新学生")
+    @PreAuthorize("@ss.hasPermission('infra:student:update')")
+    public CommonResult<Boolean> updateStudent(@Valid @RequestBody InfraStudentSaveReqVO updateReqVO) {
+        studentService.updateStudent(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除学生")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('infra:student:delete')")
+    public CommonResult<Boolean> deleteStudent(@RequestParam("id") Long id) {
+        studentService.deleteStudent(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得学生")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<InfraStudentRespVO> getStudent(@RequestParam("id") Long id) {
+        InfraStudentDO student = studentService.getStudent(id);
+        return success(BeanUtils.toBean(student, InfraStudentRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得学生分页")
+    @PreAuthorize("@ss.hasPermission('infra:student:query')")
+    public CommonResult<PageResult<InfraStudentRespVO>> getStudentPage(@Valid InfraStudentPageReqVO pageReqVO) {
+        PageResult<InfraStudentDO> pageResult = studentService.getStudentPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, InfraStudentRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出学生 Excel")
+    @PreAuthorize("@ss.hasPermission('infra:student:export')")
+    @OperateLog(type = EXPORT)
+    public void exportStudentExcel(@Valid InfraStudentPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<InfraStudentDO> list = studentService.getStudentPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "学生.xls", "数据", InfraStudentRespVO.class,
+                        BeanUtils.toBean(list, InfraStudentRespVO.class));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentDO
new file mode 100644
index 000000000..b0d4bd216
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentDO
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.infra.dal.dataobject.demo;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 学生 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("infra_student")
+@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfraStudentDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 简介
+     */
+    private String description;
+    /**
+     * 出生日期
+     */
+    private LocalDateTime birthday;
+    /**
+     * 性别
+     *
+     * 枚举 {@link TODO system_user_sex 对应的类}
+     */
+    private Integer sex;
+    /**
+     * 是否有效
+     *
+     * 枚举 {@link TODO infra_boolean_string 对应的类}
+     */
+    private Boolean enabled;
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 附件
+     */
+    private String video;
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentMapper
new file mode 100644
index 000000000..34e70a082
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentMapper
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.infra.dal.mysql.demo;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+
+/**
+ * 学生 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfraStudentMapper extends BaseMapperX<InfraStudentDO> {
+
+    default PageResult<InfraStudentDO> selectPage(InfraStudentPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<InfraStudentDO>()
+                .likeIfPresent(InfraStudentDO::getName, reqVO.getName())
+                .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday())
+                .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex())
+                .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled())
+                .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(InfraStudentDO::getId));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentPageReqVO
new file mode 100644
index 000000000..41a373012
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentPageReqVO
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 学生分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class InfraStudentPageReqVO extends PageParam {
+
+    @Schema(description = "名字", example = "芋头")
+    private String name;
+
+    @Schema(description = "出生日期")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", example = "1")
+    private Integer sex;
+
+    @Schema(description = "是否有效", example = "true")
+    private Boolean enabled;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentRespVO
new file mode 100644
index 000000000..c41a5501f
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentRespVO
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 学生 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class InfraStudentRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @ExcelProperty("编号")
+    private Long id;
+
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋头")
+    @ExcelProperty("名字")
+    private String name;
+
+    @Schema(description = "简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是介绍")
+    @ExcelProperty("简介")
+    private String description;
+
+    @Schema(description = "出生日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("出生日期")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty(value = "性别", converter = DictConvert.class)
+    @DictFormat("system_user_sex") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer sex;
+
+    @Schema(description = "是否有效", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @ExcelProperty(value = "是否有效", converter = DictConvert.class)
+    @DictFormat("infra_boolean_string") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Boolean enabled;
+
+    @Schema(description = "头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png")
+    @ExcelProperty("头像")
+    private String avatar;
+
+    @Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.mp4")
+    @ExcelProperty("附件")
+    private String video;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是备注")
+    @ExcelProperty("备注")
+    private String memo;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentSaveReqVO
new file mode 100644
index 000000000..43e7f147d
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentSaveReqVO
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 学生新增/修改 Request VO")
+@Data
+public class InfraStudentSaveReqVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋头")
+    @NotEmpty(message = "名字不能为空")
+    private String name;
+
+    @Schema(description = "简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是介绍")
+    @NotEmpty(message = "简介不能为空")
+    private String description;
+
+    @Schema(description = "出生日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "出生日期不能为空")
+    private LocalDateTime birthday;
+
+    @Schema(description = "性别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "性别不能为空")
+    private Integer sex;
+
+    @Schema(description = "是否有效", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @NotNull(message = "是否有效不能为空")
+    private Boolean enabled;
+
+    @Schema(description = "头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png")
+    @NotEmpty(message = "头像不能为空")
+    private String avatar;
+
+    @Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.mp4")
+    @NotEmpty(message = "附件不能为空")
+    private String video;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是备注")
+    @NotEmpty(message = "备注不能为空")
+    private String memo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentService
new file mode 100644
index 000000000..c4a0e1792
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentService
@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+/**
+ * 学生 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface InfraStudentService {
+
+    /**
+     * 创建学生
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createStudent(@Valid InfraStudentSaveReqVO createReqVO);
+
+    /**
+     * 更新学生
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateStudent(@Valid InfraStudentSaveReqVO updateReqVO);
+
+    /**
+     * 删除学生
+     *
+     * @param id 编号
+     */
+    void deleteStudent(Long id);
+
+    /**
+     * 获得学生
+     *
+     * @param id 编号
+     * @return 学生
+     */
+    InfraStudentDO getStudent(Long id);
+
+    /**
+     * 获得学生分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 学生分页
+     */
+    PageResult<InfraStudentDO> getStudentPage(InfraStudentPageReqVO pageReqVO);
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImpl
new file mode 100644
index 000000000..2292a66f3
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImpl
@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
+
+/**
+ * 学生 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class InfraStudentServiceImpl implements InfraStudentService {
+
+    @Resource
+    private InfraStudentMapper studentMapper;
+
+    @Override
+    public Long createStudent(InfraStudentSaveReqVO createReqVO) {
+        // 插入
+        InfraStudentDO student = BeanUtils.toBean(createReqVO, InfraStudentDO.class);
+        studentMapper.insert(student);
+        // 返回
+        return student.getId();
+    }
+
+    @Override
+    public void updateStudent(InfraStudentSaveReqVO updateReqVO) {
+        // 校验存在
+        validateStudentExists(updateReqVO.getId());
+        // 更新
+        InfraStudentDO updateObj = BeanUtils.toBean(updateReqVO, InfraStudentDO.class);
+        studentMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteStudent(Long id) {
+        // 校验存在
+        validateStudentExists(id);
+        // 删除
+        studentMapper.deleteById(id);
+    }
+
+    private void validateStudentExists(Long id) {
+        if (studentMapper.selectById(id) == null) {
+            throw exception(STUDENT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public InfraStudentDO getStudent(Long id) {
+        return studentMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<InfraStudentDO> getStudentPage(InfraStudentPageReqVO pageReqVO) {
+        return studentMapper.selectPage(pageReqVO);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImplTest
new file mode 100644
index 000000000..b5f4bf0ff
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImplTest
@@ -0,0 +1,146 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import javax.annotation.Resource;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO;
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import javax.annotation.Resource;
+import org.springframework.context.annotation.Import;
+import java.util.*;
+import java.time.LocalDateTime;
+
+import static cn.hutool.core.util.RandomUtil.*;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+/**
+ * {@link InfraStudentServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(InfraStudentServiceImpl.class)
+public class InfraStudentServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private InfraStudentServiceImpl studentService;
+
+    @Resource
+    private InfraStudentMapper studentMapper;
+
+    @Test
+    public void testCreateStudent_success() {
+        // 准备参数
+        InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null);
+
+        // 调用
+        Long studentId = studentService.createStudent(createReqVO);
+        // 断言
+        assertNotNull(studentId);
+        // 校验记录的属性是否正确
+        InfraStudentDO student = studentMapper.selectById(studentId);
+        assertPojoEquals(createReqVO, student, "id");
+    }
+
+    @Test
+    public void testUpdateStudent_success() {
+        // mock 数据
+        InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class);
+        studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> {
+            o.setId(dbStudent.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        studentService.updateStudent(updateReqVO);
+        // 校验是否更新正确
+        InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的
+        assertPojoEquals(updateReqVO, student);
+    }
+
+    @Test
+    public void testUpdateStudent_notExists() {
+        // 准备参数
+        InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteStudent_success() {
+        // mock 数据
+        InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class);
+        studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbStudent.getId();
+
+        // 调用
+        studentService.deleteStudent(id);
+       // 校验数据不存在了
+       assertNull(studentMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteStudent_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS);
+    }
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
+    public void testGetStudentPage() {
+       // mock 数据
+       InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到
+           o.setName(null);
+           o.setBirthday(null);
+           o.setSex(null);
+           o.setEnabled(null);
+           o.setCreateTime(null);
+       });
+       studentMapper.insert(dbStudent);
+       // 测试 name 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null)));
+       // 测试 birthday 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null)));
+       // 测试 sex 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null)));
+       // 测试 enabled 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null)));
+       // 测试 createTime 不匹配
+       studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null)));
+       // 准备参数
+       InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO();
+       reqVO.setName(null);
+       reqVO.setBirthday(null);
+       reqVO.setSex(null);
+       reqVO.setEnabled(null);
+       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+
+       // 调用
+       PageResult<InfraStudentDO> pageResult = studentService.getStudentPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbStudent, pageResult.getList().get(0));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/js/student b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/js/student
new file mode 100644
index 000000000..44db46806
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/js/student
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 创建学生
+export function createStudent(data) {
+  return request({
+    url: '/infra/student/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新学生
+export function updateStudent(data) {
+  return request({
+    url: '/infra/student/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除学生
+export function deleteStudent(id) {
+  return request({
+    url: '/infra/student/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得学生
+export function getStudent(id) {
+  return request({
+    url: '/infra/student/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得学生分页
+export function getStudentPage(params) {
+  return request({
+    url: '/infra/student/page',
+    method: 'get',
+    params
+  })
+}
+// 导出学生 Excel
+export function exportStudentExcel(params) {
+  return request({
+    url: '/infra/student/export-excel',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/h2
new file mode 100644
index 000000000..6c1875f60
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/h2
@@ -0,0 +1,17 @@
+-- 将该建表 SQL 语句，添加到 yudao-module-infra-biz 模块的 test/resources/sql/create_tables.sql 文件里
+CREATE TABLE IF NOT EXISTS "infra_student" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "name" varchar NOT NULL,
+    "description" varchar NOT NULL,
+    "birthday" varchar NOT NULL,
+    "sex" int NOT NULL,
+    "enabled" bit NOT NULL,
+    "avatar" varchar NOT NULL,
+    "video" varchar NOT NULL,
+    "memo" varchar NOT NULL,
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY ("id")
+) COMMENT '学生表';
+
+-- 将该删表 SQL 语句，添加到 yudao-module-infra-biz 模块的 test/resources/sql/clean.sql 文件里
+DELETE FROM "infra_student";
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/sql
new file mode 100644
index 000000000..83df27926
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/sql
@@ -0,0 +1,55 @@
+-- 菜单 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status, component_name
+)
+VALUES (
+    '学生管理', '', 2, 0, 888,
+    'student', '', 'infra/demo/index', 0, 'InfraStudent'
+);
+
+-- 按钮父菜单ID
+-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生查询', 'infra:student:query', 3, 1, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生创建', 'infra:student:create', 3, 2, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生更新', 'infra:student:update', 3, 3, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生删除', 'infra:student:delete', 3, 4, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '学生导出', 'infra:student:export', 3, 5, @parentId,
+    '', '', '', 0
+);
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/StudentForm
new file mode 100644
index 000000000..f6b171860
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/StudentForm
@@ -0,0 +1,164 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+                    <el-form-item label="名字" prop="name">
+                      <el-input v-model="formData.name" placeholder="请输入名字" />
+                    </el-form-item>
+                    <el-form-item label="简介" prop="description">
+                      <el-input v-model="formData.description" type="textarea" placeholder="请输入内容" />
+                    </el-form-item>
+                    <el-form-item label="出生日期" prop="birthday">
+                      <el-date-picker clearable v-model="formData.birthday" type="date" value-format="timestamp" placeholder="选择出生日期" />
+                    </el-form-item>
+                    <el-form-item label="性别" prop="sex">
+                      <el-select v-model="formData.sex" placeholder="请选择性别">
+                            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="是否有效" prop="enabled">
+                      <el-radio-group v-model="formData.enabled">
+                            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                                      :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="头像">
+                      <ImageUpload v-model="formData.avatar"/>
+                    </el-form-item>
+                    <el-form-item label="附件">
+                      <FileUpload v-model="formData.video"/>
+                    </el-form-item>
+                    <el-form-item label="备注">
+                      <Editor v-model="formData.memo" :min-height="192"/>
+                    </el-form-item>
+      </el-form>
+              <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as StudentApi from '@/api/infra/demo'
+  import ImageUpload from '@/components/ImageUpload';
+  import FileUpload from '@/components/FileUpload';
+  import Editor from '@/components/Editor';
+      export default {
+    name: "StudentForm",
+    components: {
+          ImageUpload,
+          FileUpload,
+          Editor,
+                    },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+                            id: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        },
+        // 表单校验
+        formRules: {
+                        name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
+                        description: [{ required: true, message: '简介不能为空', trigger: 'blur' }],
+                        birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
+                        sex: [{ required: true, message: '性别不能为空', trigger: 'change' }],
+                        enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }],
+                        avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }],
+                        video: [{ required: true, message: '附件不能为空', trigger: 'blur' }],
+                        memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+        },
+                        };
+    },
+    methods: {
+      /** 打开弹窗 */
+     open(id) {
+        this.dialogVisible = true;
+        this.reset();
+        const that = this;
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+            StudentApi.getStudent(id).then(res=>{
+              that.formData = res.data;
+              that.title = "修改学生";
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.title = "新增学生";
+              },
+      /** 提交按钮 */
+      submitForm() {
+        this.formLoading = true;
+        try {
+          const that = this;
+          let data = this.formData;
+          let validate = false;
+          // 校验主表
+          this.getRef("formRef").validate(valid => {
+            validate = valid;
+          });
+                  // 所有表单校验通过后方可提交
+          if (!validate) {
+            return;
+          }
+          // 修改的提交
+          if (data.id) {
+                  StudentApi.updateStudent(data).then(response => {
+              that.$modal.msgSuccess("修改成功");
+              that.dialogVisible = false;
+              that.$emit('success');
+            });
+            return;
+          }
+          // 添加的提交
+          StudentApi.createStudent(data).then(response => {
+            that.$modal.msgSuccess("新增成功");
+            that.dialogVisible = false;
+            that.$emit('success');
+          });
+        }finally {
+          this.formLoading = false;
+        }
+      },
+      getRef(refName){
+        return this.$refs[refName];
+      },
+                      /** 表单重置 */
+      reset() {
+        this.formData = {
+                            id: undefined,
+                            name: undefined,
+                            description: undefined,
+                            birthday: undefined,
+                            sex: undefined,
+                            enabled: undefined,
+                            avatar: undefined,
+                            video: undefined,
+                            memo: undefined,
+        };
+        this.resetForm("formRef");
+      },
+    }
+  };
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/index
new file mode 100644
index 000000000..dfdf41b09
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/index
@@ -0,0 +1,213 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="名字" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入名字" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="出生日期" prop="birthday">
+        <el-date-picker clearable v-model="queryParams.birthday" type="date" value-format="yyyy-MM-dd" placeholder="选择出生日期" />
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否有效" prop="enabled">
+        <el-select v-model="queryParams.enabled" placeholder="请选择是否有效" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['infra:student:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['infra:student:export']">导出</el-button>
+      </el-col>
+              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+            <el-table-column label="编号" align="center" prop="id">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.id" />
+        </template>
+      </el-table-column>
+      <el-table-column label="名字" align="center" prop="name">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.name" />
+        </template>
+      </el-table-column>
+      <el-table-column label="简介" align="center" prop="description">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.description" />
+        </template>
+      </el-table-column>
+      <el-table-column label="出生日期" align="center" prop="birthday" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.birthday) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" align="center" prop="sex">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否有效" align="center" prop="enabled">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
+        </template>
+      </el-table-column>
+      <el-table-column label="头像" align="center" prop="avatar">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.avatar" />
+        </template>
+      </el-table-column>
+      <el-table-column label="附件" align="center" prop="video">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.video" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="memo">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.memo" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['infra:student:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['infra:student:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 对话框(添加 / 修改) -->
+    <StudentForm ref="formRef" @success="getList" />
+    </div>
+</template>
+
+<script>
+import * as StudentApi from '@/api/infra/demo';
+import StudentForm from './StudentForm.vue';
+export default {
+  name: "Student",
+  components: {
+          StudentForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+              // 总条数
+        total: 0,
+      // 学生列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+                    pageNo: 1,
+            pageSize: 10,
+        name: null,
+        birthday: null,
+        sex: null,
+        enabled: null,
+        createTime: [],
+      },
+            };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      try {
+      this.loading = true;
+            StudentApi.getStudentPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+      });
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const that = this;
+      try {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
+          return StudentApi.deleteStudent(id);
+        }).then(() => {
+        that.getList();
+        that.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      } catch {}
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const that = this;
+      try {
+          this.$modal.confirm('是否确认导出所有学生数据项?').then(() => {
+              that.exportLoading = true;
+              return StudentApi.exportStudentExcel(params);
+            }).then(response => {
+              that.$download.excel(response, '学生.xls');
+            });
+      } catch {
+      } finally {
+        that.exportLoading = false;
+      }
+    },
+              }
+};
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/xml/InfraStudentMapper
new file mode 100644
index 000000000..155aa5c27
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/xml/InfraStudentMapper
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/assert.json
new file mode 100644
index 000000000..470a9dec8
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/assert.json
@@ -0,0 +1,49 @@
+[ {
+  "contentPath" : "java/InfraCategoryListReqVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraCategoryListReqVO.java"
+}, {
+  "contentPath" : "java/InfraCategoryRespVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraCategoryRespVO.java"
+}, {
+  "contentPath" : "java/InfraCategorySaveReqVO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraCategorySaveReqVO.java"
+}, {
+  "contentPath" : "java/InfraCategoryController",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/InfraCategoryController.java"
+}, {
+  "contentPath" : "java/InfraCategoryDO",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraCategoryDO.java"
+}, {
+  "contentPath" : "java/InfraCategoryMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraCategoryMapper.java"
+}, {
+  "contentPath" : "xml/InfraCategoryMapper",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/demo/InfraCategoryMapper.xml"
+}, {
+  "contentPath" : "java/InfraCategoryServiceImpl",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraCategoryServiceImpl.java"
+}, {
+  "contentPath" : "java/InfraCategoryService",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraCategoryService.java"
+}, {
+  "contentPath" : "java/InfraCategoryServiceImplTest",
+  "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/demo/InfraCategoryServiceImplTest.java"
+}, {
+  "contentPath" : "java/ErrorCodeConstants_手动操作",
+  "filePath" : "yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants_手动操作.java"
+}, {
+  "contentPath" : "sql/sql",
+  "filePath" : "sql/sql.sql"
+}, {
+  "contentPath" : "sql/h2",
+  "filePath" : "sql/h2.sql"
+}, {
+  "contentPath" : "vue/index",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue"
+}, {
+  "contentPath" : "js/category",
+  "filePath" : "yudao-ui-admin-vue2/src/api/infra/category.js"
+}, {
+  "contentPath" : "vue/CategoryForm",
+  "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/CategoryForm.vue"
+} ]
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/ErrorCodeConstants_手动操作
new file mode 100644
index 000000000..36df6752e
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/ErrorCodeConstants_手动操作
@@ -0,0 +1,8 @@
+// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！
+// ========== 分类 TODO 补充编号 ==========
+ErrorCode CATEGORY_NOT_EXISTS = new ErrorCode(TODO 补充编号, "分类不存在");
+ErrorCode CATEGORY_EXITS_CHILDREN = new ErrorCode(TODO 补充编号, "存在存在子分类，无法删除");
+ErrorCode CATEGORY_PARENT_NOT_EXITS = new ErrorCode(TODO 补充编号,"父级分类不存在");
+ErrorCode CATEGORY_PARENT_ERROR = new ErrorCode(TODO 补充编号, "不能设置自己为父分类");
+ErrorCode CATEGORY_NAME_DUPLICATE = new ErrorCode(TODO 补充编号, "已经存在该名字的分类");
+ErrorCode CATEGORY_PARENT_IS_CHILD = new ErrorCode(TODO 补充编号, "不能设置自己的子InfraCategory为父InfraCategory");
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryController
new file mode 100644
index 000000000..a7b2f8163
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryController
@@ -0,0 +1,94 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO;
+import cn.iocoder.yudao.module.infra.service.demo.InfraCategoryService;
+
+@Tag(name = "管理后台 - 分类")
+@RestController
+@RequestMapping("/infra/category")
+@Validated
+public class InfraCategoryController {
+
+    @Resource
+    private InfraCategoryService categoryService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建分类")
+    @PreAuthorize("@ss.hasPermission('infra:category:create')")
+    public CommonResult<Long> createCategory(@Valid @RequestBody InfraCategorySaveReqVO createReqVO) {
+        return success(categoryService.createCategory(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新分类")
+    @PreAuthorize("@ss.hasPermission('infra:category:update')")
+    public CommonResult<Boolean> updateCategory(@Valid @RequestBody InfraCategorySaveReqVO updateReqVO) {
+        categoryService.updateCategory(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除分类")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('infra:category:delete')")
+    public CommonResult<Boolean> deleteCategory(@RequestParam("id") Long id) {
+        categoryService.deleteCategory(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得分类")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('infra:category:query')")
+    public CommonResult<InfraCategoryRespVO> getCategory(@RequestParam("id") Long id) {
+        InfraCategoryDO category = categoryService.getCategory(id);
+        return success(BeanUtils.toBean(category, InfraCategoryRespVO.class));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得分类列表")
+    @PreAuthorize("@ss.hasPermission('infra:category:query')")
+    public CommonResult<List<InfraCategoryRespVO>> getCategoryList(@Valid InfraCategoryListReqVO listReqVO) {
+        List<InfraCategoryDO> list = categoryService.getCategoryList(listReqVO);
+        return success(BeanUtils.toBean(list, InfraCategoryRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出分类 Excel")
+    @PreAuthorize("@ss.hasPermission('infra:category:export')")
+    @OperateLog(type = EXPORT)
+    public void exportCategoryExcel(@Valid InfraCategoryListReqVO listReqVO,
+              HttpServletResponse response) throws IOException {
+        List<InfraCategoryDO> list = categoryService.getCategoryList(listReqVO);
+        // 导出 Excel
+        ExcelUtils.write(response, "分类.xls", "数据", InfraCategoryRespVO.class,
+                        BeanUtils.toBean(list, InfraCategoryRespVO.class));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryDO
new file mode 100644
index 000000000..9bf21c08b
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryDO
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.infra.dal.dataobject.demo;
+
+import lombok.*;
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 分类 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("infra_category")
+@KeySequence("infra_category_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfraCategoryDO extends BaseDO {
+
+    public static final Long PARENT_ID_ROOT = 0L;
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 名字
+     */
+    private String name;
+    /**
+     * 父编号
+     */
+    private Long parentId;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryListReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryListReqVO
new file mode 100644
index 000000000..e5c6f181f
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryListReqVO
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+@Schema(description = "管理后台 - 分类列表 Request VO")
+@Data
+public class InfraCategoryListReqVO {
+
+    @Schema(description = "名字", example = "芋头")
+    private String name;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryMapper
new file mode 100644
index 000000000..9dadbf1d9
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryMapper
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.infra.dal.mysql.demo;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+
+/**
+ * 分类 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface InfraCategoryMapper extends BaseMapperX<InfraCategoryDO> {
+
+    default List<InfraCategoryDO> selectList(InfraCategoryListReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<InfraCategoryDO>()
+                .likeIfPresent(InfraCategoryDO::getName, reqVO.getName())
+                .orderByDesc(InfraCategoryDO::getId));
+    }
+
+	default InfraCategoryDO selectByParentIdAndName(Long parentId, String name) {
+	    return selectOne(InfraCategoryDO::getParentId, parentId, InfraCategoryDO::getName, name);
+	}
+
+    default Long selectCountByParentId(Long parentId) {
+        return selectCount(InfraCategoryDO::getParentId, parentId);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryRespVO
new file mode 100644
index 000000000..6325d866c
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryRespVO
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 分类 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class InfraCategoryRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @ExcelProperty("编号")
+    private Long id;
+
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋头")
+    @ExcelProperty("名字")
+    private String name;
+
+    @Schema(description = "父编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
+    @ExcelProperty("父编号")
+    private Long parentId;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategorySaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategorySaveReqVO
new file mode 100644
index 000000000..3c03b977f
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategorySaveReqVO
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+
+@Schema(description = "管理后台 - 分类新增/修改 Request VO")
+@Data
+public class InfraCategorySaveReqVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋头")
+    @NotEmpty(message = "名字不能为空")
+    private String name;
+
+    @Schema(description = "父编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
+    @NotNull(message = "父编号不能为空")
+    private Long parentId;
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryService
new file mode 100644
index 000000000..9d0ae1afa
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryService
@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+/**
+ * 分类 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface InfraCategoryService {
+
+    /**
+     * 创建分类
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createCategory(@Valid InfraCategorySaveReqVO createReqVO);
+
+    /**
+     * 更新分类
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateCategory(@Valid InfraCategorySaveReqVO updateReqVO);
+
+    /**
+     * 删除分类
+     *
+     * @param id 编号
+     */
+    void deleteCategory(Long id);
+
+    /**
+     * 获得分类
+     *
+     * @param id 编号
+     * @return 分类
+     */
+    InfraCategoryDO getCategory(Long id);
+
+    /**
+     * 获得分类列表
+     *
+     * @param listReqVO 查询条件
+     * @return 分类列表
+     */
+    List<InfraCategoryDO> getCategoryList(InfraCategoryListReqVO listReqVO);
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImpl
new file mode 100644
index 000000000..351568b18
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImpl
@@ -0,0 +1,136 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraCategoryMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
+
+/**
+ * 分类 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class InfraCategoryServiceImpl implements InfraCategoryService {
+
+    @Resource
+    private InfraCategoryMapper categoryMapper;
+
+    @Override
+    public Long createCategory(InfraCategorySaveReqVO createReqVO) {
+        // 校验父编号的有效性
+        validateParentCategory(null, createReqVO.getParentId());
+        // 校验名字的唯一性
+        validateCategoryNameUnique(null, createReqVO.getParentId(), createReqVO.getName());
+
+        // 插入
+        InfraCategoryDO category = BeanUtils.toBean(createReqVO, InfraCategoryDO.class);
+        categoryMapper.insert(category);
+        // 返回
+        return category.getId();
+    }
+
+    @Override
+    public void updateCategory(InfraCategorySaveReqVO updateReqVO) {
+        // 校验存在
+        validateCategoryExists(updateReqVO.getId());
+        // 校验父编号的有效性
+        validateParentCategory(updateReqVO.getId(), updateReqVO.getParentId());
+        // 校验名字的唯一性
+        validateCategoryNameUnique(updateReqVO.getId(), updateReqVO.getParentId(), updateReqVO.getName());
+
+        // 更新
+        InfraCategoryDO updateObj = BeanUtils.toBean(updateReqVO, InfraCategoryDO.class);
+        categoryMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteCategory(Long id) {
+        // 校验存在
+        validateCategoryExists(id);
+        // 校验是否有子分类
+        if (categoryMapper.selectCountByParentId(id) > 0) {
+            throw exception(CATEGORY_EXITS_CHILDREN);
+        }
+        // 删除
+        categoryMapper.deleteById(id);
+    }
+
+    private void validateCategoryExists(Long id) {
+        if (categoryMapper.selectById(id) == null) {
+            throw exception(CATEGORY_NOT_EXISTS);
+        }
+    }
+
+    private void validateParentCategory(Long id, Long parentId) {
+        if (parentId == null || CategoryDO.PARENT_ID_ROOT.equals(parentId)) {
+            return;
+        }
+        // 1. 不能设置自己为父分类
+        if (Objects.equals(id, parentId)) {
+            throw exception(CATEGORY_PARENT_ERROR);
+        }
+        // 2. 父分类不存在
+        CategoryDO parentCategory = categoryMapper.selectById(parentId);
+        if (parentCategory == null) {
+            throw exception(CATEGORY_PARENT_NOT_EXITS);
+        }
+        // 3. 递归校验父分类，如果父分类是自己的子分类，则报错，避免形成环路
+        if (id == null) { // id 为空，说明新增，不需要考虑环路
+            return;
+        }
+        for (int i = 0; i < Short.MAX_VALUE; i++) {
+            // 3.1 校验环路
+            parentId = parentCategory.getParentId();
+            if (Objects.equals(id, parentId)) {
+                throw exception(CATEGORY_PARENT_IS_CHILD);
+            }
+            // 3.2 继续递归下一级父分类
+            if (parentId == null || CategoryDO.PARENT_ID_ROOT.equals(parentId)) {
+                break;
+            }
+            parentCategory = categoryMapper.selectById(parentId);
+            if (parentCategory == null) {
+                break;
+            }
+        }
+    }
+
+    private void validateCategoryNameUnique(Long id, Long parentId, String name) {
+        CategoryDO category = categoryMapper.selectByParentIdAndName(parentId, name);
+        if (category == null) {
+            return;
+        }
+        // 如果 id 为空，说明不用比较是否为相同 id 的分类
+        if (id == null) {
+            throw exception(CATEGORY_NAME_DUPLICATE);
+        }
+        if (!Objects.equals(category.getId(), id)) {
+            throw exception(CATEGORY_NAME_DUPLICATE);
+        }
+    }
+
+    @Override
+    public InfraCategoryDO getCategory(Long id) {
+        return categoryMapper.selectById(id);
+    }
+
+    @Override
+    public List<InfraCategoryDO> getCategoryList(InfraCategoryListReqVO listReqVO) {
+        return categoryMapper.selectList(listReqVO);
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImplTest
new file mode 100644
index 000000000..efb70fd33
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImplTest
@@ -0,0 +1,129 @@
+package cn.iocoder.yudao.module.infra.service.demo;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import javax.annotation.Resource;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+
+import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
+import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO;
+import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraCategoryMapper;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import javax.annotation.Resource;
+import org.springframework.context.annotation.Import;
+import java.util.*;
+import java.time.LocalDateTime;
+
+import static cn.hutool.core.util.RandomUtil.*;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+/**
+ * {@link InfraCategoryServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(InfraCategoryServiceImpl.class)
+public class InfraCategoryServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private InfraCategoryServiceImpl categoryService;
+
+    @Resource
+    private InfraCategoryMapper categoryMapper;
+
+    @Test
+    public void testCreateCategory_success() {
+        // 准备参数
+        InfraCategorySaveReqVO createReqVO = randomPojo(InfraCategorySaveReqVO.class).setId(null);
+
+        // 调用
+        Long categoryId = categoryService.createCategory(createReqVO);
+        // 断言
+        assertNotNull(categoryId);
+        // 校验记录的属性是否正确
+        InfraCategoryDO category = categoryMapper.selectById(categoryId);
+        assertPojoEquals(createReqVO, category, "id");
+    }
+
+    @Test
+    public void testUpdateCategory_success() {
+        // mock 数据
+        InfraCategoryDO dbCategory = randomPojo(InfraCategoryDO.class);
+        categoryMapper.insert(dbCategory);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        InfraCategorySaveReqVO updateReqVO = randomPojo(InfraCategorySaveReqVO.class, o -> {
+            o.setId(dbCategory.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        categoryService.updateCategory(updateReqVO);
+        // 校验是否更新正确
+        InfraCategoryDO category = categoryMapper.selectById(updateReqVO.getId()); // 获取最新的
+        assertPojoEquals(updateReqVO, category);
+    }
+
+    @Test
+    public void testUpdateCategory_notExists() {
+        // 准备参数
+        InfraCategorySaveReqVO updateReqVO = randomPojo(InfraCategorySaveReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> categoryService.updateCategory(updateReqVO), CATEGORY_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteCategory_success() {
+        // mock 数据
+        InfraCategoryDO dbCategory = randomPojo(InfraCategoryDO.class);
+        categoryMapper.insert(dbCategory);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbCategory.getId();
+
+        // 调用
+        categoryService.deleteCategory(id);
+       // 校验数据不存在了
+       assertNull(categoryMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteCategory_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> categoryService.deleteCategory(id), CATEGORY_NOT_EXISTS);
+    }
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
+    public void testGetCategoryList() {
+       // mock 数据
+       InfraCategoryDO dbCategory = randomPojo(InfraCategoryDO.class, o -> { // 等会查询到
+           o.setName(null);
+       });
+       categoryMapper.insert(dbCategory);
+       // 测试 name 不匹配
+       categoryMapper.insert(cloneIgnoreId(dbCategory, o -> o.setName(null)));
+       // 准备参数
+       InfraCategoryListReqVO reqVO = new InfraCategoryListReqVO();
+       reqVO.setName(null);
+
+       // 调用
+       List<InfraCategoryDO> list = categoryService.getCategoryList(reqVO);
+       // 断言
+       assertEquals(1, list.size());
+       assertPojoEquals(dbCategory, list.get(0));
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/js/category b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/js/category
new file mode 100644
index 000000000..1e6ffdcea
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/js/category
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 创建分类
+export function createCategory(data) {
+  return request({
+    url: '/infra/category/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新分类
+export function updateCategory(data) {
+  return request({
+    url: '/infra/category/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除分类
+export function deleteCategory(id) {
+  return request({
+    url: '/infra/category/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得分类
+export function getCategory(id) {
+  return request({
+    url: '/infra/category/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得分类列表
+export function getCategoryList(params) {
+  return request({
+    url: '/infra/category/list',
+    method: 'get',
+    params
+  })
+}
+// 导出分类 Excel
+export function exportCategoryExcel(params) {
+  return request({
+    url: '/infra/category/export-excel',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/h2
new file mode 100644
index 000000000..4141766cf
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/h2
@@ -0,0 +1,10 @@
+-- 将该建表 SQL 语句，添加到 yudao-module-infra-biz 模块的 test/resources/sql/create_tables.sql 文件里
+CREATE TABLE IF NOT EXISTS "infra_category" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "name" varchar NOT NULL,
+    "description" bigint NOT NULL,
+    PRIMARY KEY ("id")
+) COMMENT '分类表';
+
+-- 将该删表 SQL 语句，添加到 yudao-module-infra-biz 模块的 test/resources/sql/clean.sql 文件里
+DELETE FROM "infra_category";
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/sql
new file mode 100644
index 000000000..81409488a
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/sql
@@ -0,0 +1,55 @@
+-- 菜单 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status, component_name
+)
+VALUES (
+    '分类管理', '', 2, 0, 888,
+    'category', '', 'infra/demo/index', 0, 'InfraCategory'
+);
+
+-- 按钮父菜单ID
+-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '分类查询', 'infra:category:query', 3, 1, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '分类创建', 'infra:category:create', 3, 2, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '分类更新', 'infra:category:update', 3, 3, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '分类删除', 'infra:category:delete', 3, 4, @parentId,
+    '', '', '', 0
+);
+INSERT INTO system_menu(
+    name, permission, type, sort, parent_id,
+    path, icon, component, status
+)
+VALUES (
+    '分类导出', 'infra:category:export', 3, 5, @parentId,
+    '', '', '', 0
+);
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/CategoryForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/CategoryForm
new file mode 100644
index 000000000..4a364ba14
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/CategoryForm
@@ -0,0 +1,147 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+                    <el-form-item label="名字" prop="name">
+                      <el-input v-model="formData.name" placeholder="请输入名字" />
+                    </el-form-item>
+                    <el-form-item label="父编号" prop="parentId">
+                      <TreeSelect
+                          v-model="formData.parentId"
+                          :options="categoryTree"
+                          :normalizer="normalizer"
+                          placeholder="请选择父编号"
+                      />
+                    </el-form-item>
+      </el-form>
+              <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as CategoryApi from '@/api/infra/demo'
+    import TreeSelect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+    export default {
+    name: "CategoryForm",
+    components: {
+                  TreeSelect,
+            },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+                            id: undefined,
+                            name: undefined,
+                            parentId: undefined,
+        },
+        // 表单校验
+        formRules: {
+                        name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
+                        parentId: [{ required: true, message: '父编号不能为空', trigger: 'blur' }],
+        },
+                       categoryTree: [], // 树形结构
+              };
+    },
+    methods: {
+      /** 打开弹窗 */
+     open(id) {
+        this.dialogVisible = true;
+        this.reset();
+        const that = this;
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+            CategoryApi.getCategory(id).then(res=>{
+              that.formData = res.data;
+              that.title = "修改分类";
+            })
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.title = "新增分类";
+                    this.getCategoryTree();
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.formLoading = true;
+        try {
+          const that = this;
+          let data = this.formData;
+          let validate = false;
+          // 校验主表
+          this.getRef("formRef").validate(valid => {
+            validate = valid;
+          });
+                  // 所有表单校验通过后方可提交
+          if (!validate) {
+            return;
+          }
+          // 修改的提交
+          if (data.id) {
+                  CategoryApi.updateCategory(data).then(response => {
+              that.$modal.msgSuccess("修改成功");
+              that.dialogVisible = false;
+              that.$emit('success');
+            });
+            return;
+          }
+          // 添加的提交
+          CategoryApi.createCategory(data).then(response => {
+            that.$modal.msgSuccess("新增成功");
+            that.dialogVisible = false;
+            that.$emit('success');
+          });
+        }finally {
+          this.formLoading = false;
+        }
+      },
+      getRef(refName){
+        return this.$refs[refName];
+      },
+                  /** 获得分类树 */
+          getCategoryTree() {
+            const that = this;
+            that.categoryTree = [];
+                  CategoryApi.getCategoryList().then(res=>{
+              const root = { id: 0, name: '顶级分类', children: [] };
+              root.children = this.handleTree(res.data, 'id', 'parentId')
+              that.categoryTree.push(root)
+            });
+          },
+                  /** 转换分类数据结构 */
+          normalizer(node) {
+            if (node.children && !node.children.length) {
+              delete node.children;
+            }
+                return {
+                  id: node.id,
+                  label: node.name,
+                  children: node.children
+                };
+          },
+      /** 表单重置 */
+      reset() {
+        this.formData = {
+                            id: undefined,
+                            name: undefined,
+                            parentId: undefined,
+        };
+        this.resetForm("formRef");
+      },
+    }
+  };
+</script>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/index
new file mode 100644
index 000000000..9ae16fafa
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/index
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="名字" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入名字" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['infra:category:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['infra:category:export']">导出</el-button>
+      </el-col>
+                  <el-col :span="1.5">
+            <el-button type="danger" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">
+              展开/折叠
+            </el-button>
+          </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+            <el-table
+          v-loading="loading"
+          :data="list"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          v-if="refreshTable"
+          row-key="id"
+          :default-expand-all="isExpandAll"
+          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      >
+            <el-table-column label="编号" align="center" prop="id">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.id" />
+        </template>
+      </el-table-column>
+      <el-table-column label="名字" align="center" prop="name">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.name" />
+        </template>
+      </el-table-column>
+      <el-table-column label="父编号" align="center" prop="parentId">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.parentId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['infra:category:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['infra:category:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 对话框(添加 / 修改) -->
+    <CategoryForm ref="formRef" @success="getList" />
+    </div>
+</template>
+
+<script>
+import * as CategoryApi from '@/api/infra/demo';
+import CategoryForm from './CategoryForm.vue';
+export default {
+  name: "Category",
+  components: {
+          CategoryForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+            // 分类列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+                name: null,
+      },
+            };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      try {
+      this.loading = true;
+              CategoryApi.getCategoryList(this.queryParams).then(response => {
+          this.list = this.handleTree(response.data, 'id', 'parentId');
+        })
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const that = this;
+      try {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除分类编号为"' + id + '"的数据项?').then(()=>{
+          return CategoryApi.deleteCategory(id);
+        }).then(() => {
+        that.getList();
+        that.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      } catch {}
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const that = this;
+      try {
+          this.$modal.confirm('是否确认导出所有分类数据项?').then(() => {
+              that.exportLoading = true;
+              return CategoryApi.exportCategoryExcel(params);
+            }).then(response => {
+              that.$download.excel(response, '分类.xls');
+            });
+      } catch {
+      } finally {
+        that.exportLoading = false;
+      }
+    },
+                    /** 展开/折叠操作 */
+        toggleExpandAll() {
+          this.refreshTable = false
+          this.isExpandAll = !this.isExpandAll
+          this.$nextTick(function () {
+            this.refreshTable = true
+          })
+        }
+  }
+};
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/xml/InfraCategoryMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/xml/InfraCategoryMapper
new file mode 100644
index 000000000..025ac8507
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/xml/InfraCategoryMapper
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraCategoryMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
\ No newline at end of file

From 86160f40defa30e919b9ac164fd9baaf773e3d2a Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 27 Nov 2023 16:30:30 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E9=87=8D=E6=9E=84=20vue2=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E7=89=88=EF=BC=8C=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=20async=20await=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=B1=82=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue/views/components/form_sub_erp.vue.vm  |  34 ++---
 .../views/components/form_sub_normal.vue.vm   |  15 +-
 .../vue/views/components/list_sub_erp.vue.vm  |  45 +++---
 .../resources/codegen/vue/views/form.vue.vm   | 137 ++++++------------
 .../resources/codegen/vue/views/index.vue.vm  |  44 +++---
 5 files changed, 103 insertions(+), 172 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
index e44b16bb7..eb32690b4 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
@@ -145,19 +145,17 @@
     },
     methods: {
       /** 打开弹窗 */
-      open(id, ${subJoinColumn.javaField}) {
+      async open(id, ${subJoinColumn.javaField}) {
         this.dialogVisible = true;
         this.reset();
-        const that = this;
         this.formData.${subJoinColumn.javaField} = ${subJoinColumn.javaField};
         // 修改时，设置数据
         if (id) {
           this.formLoading = true;
           try {
-              ${simpleClassName}Api.get${subSimpleClassName}(id).then(res=>{
-              that.formData = res.data;
-              that.dialogTitle = "修改${subTable.classComment}";
-            })
+            const res = await ${simpleClassName}Api.get${subSimpleClassName}(id);
+            this.formData = res.data;
+            this.dialogTitle = "修改${subTable.classComment}";
           } finally {
             this.formLoading = false;
           }
@@ -165,32 +163,26 @@
         this.dialogTitle = "新增${subTable.classComment}";
       },
       /** 提交按钮 */
-      submitForm() {
+      async submitForm() {
+        await this.#[[$]]#refs["formRef"].validate();
         this.formLoading = true;
         try {
-          let data = this.formData;
-          this.#[[$]]#refs["formRef"].validate(valid => {
-            if (!valid) {
-              return;
-            }
+            const data = this.formData;
             // 修改的提交
             if (data.${primaryColumn.javaField}) {
-              ${simpleClassName}Api.update${subSimpleClassName}(data).then(response => {
-                this.#[[$modal]]#.msgSuccess("修改成功");
-                this.dialogVisible = false;
-                this.#[[$]]#emit('success');
-              });
+            await  ${simpleClassName}Api.update${subSimpleClassName}(data);
+            this.#[[$modal]]#.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.#[[$]]#emit('success');
               return;
             }
             // 添加的提交
-            ${simpleClassName}Api.create${subSimpleClassName}(data).then(response => {
+              await ${simpleClassName}Api.create${subSimpleClassName}(data);
               this.#[[$modal]]#.msgSuccess("新增成功");
               this.dialogVisible = false;
               this.#[[$]]#emit('success');
-            });
-          });
         }finally {
-          this.formLoading = false
+          this.formLoading = false;
         }
       },
       /** 表单重置 */
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
index c450fecb0..d8051d545 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
@@ -289,13 +289,14 @@
           }
           try {
             this.formLoading = true;
+            // 这里还是需要获取一下 this 的不然取不到 formData
             const that = this;
             #if ( $subTable.subJoinMany )
-            ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(val).then(res=>{
+            ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(val).then(function (res){
               that.formData = res.data;
             })
             #else
-            ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(val).then(res=>{
+            ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(val).then(function (res){
               const data = res.data;
               if (!data) {
                 return
@@ -325,21 +326,21 @@
                     #end
                 #end
             }
-            row.${subJoinColumn.javaField} = this.${subJoinColumn.javaField}
-            this.formData.push(row)
+            row.${subJoinColumn.javaField} = this.${subJoinColumn.javaField};
+            this.formData.push(row);
           },
           /** 删除按钮操作 */
           handleDelete(index) {
-            this.formData.splice(index, 1)
+            this.formData.splice(index, 1);
           },
         #end
       /** 表单校验 */
       validate(){
-        return this.#[[$]]#refs["formRef"].validate()
+        return this.#[[$]]#refs["formRef"].validate();
       },
       /** 表单值 */
       getData(){
-        return this.formData
+        return this.formData;
       }
     }
   };
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
index 63fb41381..c08e53032 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
@@ -111,28 +111,24 @@
     },
     methods: {
       /** 查询列表 */
-      getList() {
+      async getList() {
         try {
           this.loading = true;
-          const that = this;
           #if ($table.templateType == 11)
-          ${simpleClassName}Api.get${subSimpleClassName}Page(this.queryParams).then(response => {
-            that.list = response.data.list;
-            that.total = response.data.total;
-          });
+            const res = await ${simpleClassName}Api.get${subSimpleClassName}Page(this.queryParams);
+            this.list = res.data.list;
+            this.total = res.data.total;
           #else
               #if ( $subTable.subJoinMany )
-                ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(this.${subJoinColumn.javaField}).then(response=>{
-                  that.list = response.data;
-              })
+                const res = await ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(this.${subJoinColumn.javaField});
+                this.list = res.data;
               #else
-                ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(this.${subJoinColumn.javaField}).then(response=>{
-                  const data = response.data;
-                  if (!data) {
-                    return
-                  }
-                  that.list.push(data)
-              })
+                const res = await  ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(this.${subJoinColumn.javaField});
+                const data = res.data;
+                if (!data) {
+                  return;
+                }
+                this.list.push(data);
               #end
           #end
         } finally {
@@ -148,22 +144,19 @@
       /** 添加/修改操作 */
       openForm(id) {
         if (!this.${subJoinColumn.javaField}) {
-          that.#[[$modal]]#.msgError('请选择一个${table.classComment}');
+          this.#[[$modal]]#.msgError('请选择一个${table.classComment}');
           return;
         }
         this.#[[$]]#refs["formRef"].open(id, this.${subJoinColumn.javaField});
       },
       /** 删除按钮操作 */
-      handleDelete(row) {
-        const that = this;
+      async handleDelete(row) {
+        const ${primaryColumn.javaField} = row.${primaryColumn.javaField};
+        await this.#[[$modal]]#.confirm('是否确认删除${table.classComment}编号为"' + ${primaryColumn.javaField} + '"的数据项?');
         try {
-          const ${primaryColumn.javaField} = row.${primaryColumn.javaField};
-          this.#[[$modal]]#.confirm('是否确认删除${table.classComment}编号为"' + ${primaryColumn.javaField} + '"的数据项?').then(()=>{
-            return ${simpleClassName}Api.delete${subSimpleClassName}(${primaryColumn.javaField});
-          }).then(() => {
-            that.getList();
-            that.#[[$modal]]#.msgSuccess("删除成功");
-          }).catch(() => {});
+          await ${simpleClassName}Api.delete${subSimpleClassName}(${primaryColumn.javaField});
+          await this.getList();
+          this.#[[$modal]]#.msgSuccess("删除成功");
         } catch {}
       },
 #end
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
index d6c050719..27911acf2 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
@@ -195,18 +195,16 @@
     },
     methods: {
       /** 打开弹窗 */
-     open(id) {
+     async open(id) {
         this.dialogVisible = true;
         this.reset();
-        const that = this;
         // 修改时，设置数据
         if (id) {
           this.formLoading = true;
           try {
-            ${simpleClassName}Api.get${simpleClassName}(id).then(res=>{
-              that.formData = res.data;
-              that.title = "修改${table.classComment}";
-            })
+            const res = await ${simpleClassName}Api.get${simpleClassName}(id);
+            this.formData = res.data;
+            this.title = "修改${table.classComment}";
           } finally {
             this.formLoading = false;
           }
@@ -218,111 +216,66 @@
         #end
       },
       /** 提交按钮 */
-      submitForm() {
+      async submitForm() {
+        // 校验主表
+        await this.$refs["formRef"].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))
+                    try {
+                      ## 代码生成后会替换为正确的 refs
+                      await this.refs['${subClassNameVar}FormRef'].validate();
+                    } catch (e) {
+                      this.subTabsName = '${subClassNameVar}';
+                      return;
+                    }
+                  #end
+              #end
+          #end
         this.formLoading = true;
         try {
-          const that = this;
-          let data = this.formData;
-          let validate = false;
-          // 校验主表
-          this.getRef("formRef").validate(valid => {
-            validate = valid;
-          });
+          const data = this.formData;
         ## 特殊：主子表专属逻辑
         #if ( $table.templateType == 10 || $table.templateType == 12 )
         #if ( $subTables && $subTables.size() > 0 )
-            // 校验子表
-            this.validateSubFrom01().then(() => {
-            // 全部校验通过-拼接子表的数据
             // 拼接子表的数据
-              #foreach ($subTable in $subTables)
-                  #set ($index = $foreach.count - 1)
-                  #set ($subClassNameVar = $subClassNameVars.get($index))
-                data.${subClassNameVar}#if ( $subTable.subJoinMany)s#end = that.getRef('${subClassNameVar}FormRef').getData();
-              #end
-            }).catch((err) => {
-                validate = false;
-                that.subTabsName = err.replace("FormRef", ""); // 定位到没有校验通过的子表单
-            })
+            #foreach ($subTable in $subTables)
+                #set ($index = $foreach.count - 1)
+                #set ($subClassNameVar = $subClassNameVars.get($index))
+              data.${subClassNameVar}#if ( $subTable.subJoinMany)s#end = this.refs['${subClassNameVar}FormRef'].getData();
+            #end
         #end
         #end
-          // 所有表单校验通过后方可提交
-          if (!validate) {
-            return;
-          }
           // 修改的提交
           if (data.${primaryColumn.javaField}) {
-                  ${simpleClassName}Api.update${simpleClassName}(data).then(response => {
-              that.#[[$modal]]#.msgSuccess("修改成功");
-              that.dialogVisible = false;
-              that.#[[$]]#emit('success');
-            });
+            await ${simpleClassName}Api.update${simpleClassName}(data);
+            this.#[[$modal]]#.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.#[[$]]#emit('success');
             return;
           }
           // 添加的提交
-          ${simpleClassName}Api.create${simpleClassName}(data).then(response => {
-            that.#[[$modal]]#.msgSuccess("新增成功");
-            that.dialogVisible = false;
-            that.#[[$]]#emit('success');
-          });
+          await ${simpleClassName}Api.create${simpleClassName}(data);
+          this.#[[$modal]]#.msgSuccess("新增成功");
+          this.dialogVisible = false;
+          this.#[[$]]#emit('success');
         }finally {
           this.formLoading = false;
         }
       },
-      getRef(refName){
-        return this.#[[$]]#refs[refName];
-      },
-## 特殊：主子表专属逻辑
-#if ( $table.templateType == 10 || $table.templateType == 12 )
-#if ( $subTables && $subTables.size() > 0 )
-      /** 校验子表单 */
-      validateSubFrom(item) {
-        return new Promise((resolve, reject) => {
-          this.getRef(item).validate()
-          .then(() => {
-            resolve();
-          })
-          .catch(() => {
-            reject(item);
-          })
-        })
-      },
-      /** 校验所有子表单 */
-      validateSubFrom01() {
-        // 需要校验的表单 ref
-        const validFormRefArr = [
-            #foreach ($subTable in $subTables)
-                #set ($index = $foreach.count - 1)
-                #set ($subClassNameVar = $subClassNameVars.get($index))
-              "${subClassNameVar}FormRef",
-            #end
-        ];
-        const validArr = []; // 校验
-        for (const item of validFormRefArr) {
-          validArr.push(this.validateSubFrom(item));
-        }
-        return new Promise((resolve, reject) => {
-          // 校验所有
-          Promise.all(validArr).then(() => {
-            resolve();
-          }).catch((err) => {
-            reject(err);
-          })
-        })
-      },
-#end
-#end
         ## 特殊：树表专属逻辑
         #if ( $table.templateType == 2 )
           /** 获得${table.classComment}树 */
-          get${simpleClassName}Tree() {
-            const that = this;
-            that.${classNameVar}Tree = [];
-                  ${simpleClassName}Api.get${simpleClassName}List().then(res=>{
-              const root = { id: 0, name: '顶级${table.classComment}', children: [] };
-              root.children = this.handleTree(res.data, 'id', '${treeParentColumn.javaField}')
-              that.${classNameVar}Tree.push(root)
-            });
+         async get${simpleClassName}Tree() {
+            this.${classNameVar}Tree = [];
+            const res = await ${simpleClassName}Api.get${simpleClassName}List();
+            const root = { id: 0, name: '顶级${table.classComment}', children: [] };
+            root.children = this.handleTree(res.data, 'id', '${treeParentColumn.javaField}')
+            this.${classNameVar}Tree.push(root)
           },
         #end
         ## 特殊：树表专属逻辑
@@ -361,7 +314,7 @@
             #end
         };
         this.resetForm("formRef");
-      },
+      }
     }
   };
 </script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
index 2150cbf76..1e55d6b16 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
@@ -262,19 +262,17 @@ export default {
   },
   methods: {
     /** 查询列表 */
-    getList() {
+    async getList() {
       try {
       this.loading = true;
       ## 特殊：树表专属逻辑（树不需要分页接口）
       #if ( $table.templateType == 2 )
-        ${simpleClassName}Api.get${simpleClassName}List(this.queryParams).then(response => {
-          this.list = this.handleTree(response.data, 'id', '${treeParentColumn.javaField}');
-        })
+       const res = await ${simpleClassName}Api.get${simpleClassName}List(this.queryParams);
+       this.list = this.handleTree(res.data, 'id', '${treeParentColumn.javaField}');
       #else
-      ${simpleClassName}Api.get${simpleClassName}Page(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-      });
+        const res = await ${simpleClassName}Api.get${simpleClassName}Page(this.queryParams);
+        this.list = res.data.list;
+        this.total = res.data.total;
       #end
       } finally {
         this.loading = false;
@@ -295,31 +293,25 @@ export default {
       this.#[[$]]#refs["formRef"].open(id);
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
-      const that = this;
-      try {
+    async handleDelete(row) {
       const ${primaryColumn.javaField} = row.${primaryColumn.javaField};
-      this.#[[$modal]]#.confirm('是否确认删除${table.classComment}编号为"' + ${primaryColumn.javaField} + '"的数据项?').then(()=>{
-          return ${simpleClassName}Api.delete${simpleClassName}(${primaryColumn.javaField});
-        }).then(() => {
-        that.getList();
-        that.#[[$modal]]#.msgSuccess("删除成功");
-        }).catch(() => {});
+      await this.#[[$modal]]#.confirm('是否确认删除${table.classComment}编号为"' + ${primaryColumn.javaField} + '"的数据项?')
+      try {
+       await ${simpleClassName}Api.delete${simpleClassName}(${primaryColumn.javaField});
+       this.getList();
+       this.#[[$modal]]#.msgSuccess("删除成功");
       } catch {}
     },
     /** 导出按钮操作 */
-    handleExport() {
-      const that = this;
+    async handleExport() {
+      await this.#[[$modal]]#.confirm('是否确认导出所有${table.classComment}数据项?');
       try {
-          this.#[[$modal]]#.confirm('是否确认导出所有${table.classComment}数据项?').then(() => {
-              that.exportLoading = true;
-              return ${simpleClassName}Api.export${simpleClassName}Excel(params);
-            }).then(response => {
-              that.#[[$]]#download.excel(response, '${table.classComment}.xls');
-            });
+        this.exportLoading = true;
+        const res = await ${simpleClassName}Api.export${simpleClassName}Excel(this.queryParams);
+        this.#[[$]]#download.excel(res.data, '${table.classComment}.xls');
       } catch {
       } finally {
-        that.exportLoading = false;
+        this.exportLoading = false;
       }
     },
       ## 特殊：主子表专属逻辑

From 4f42e7ca68dc4372dea03e445b3cfc257dfd25fe Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 27 Nov 2023 16:31:06 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9AVue2=20=E7=95=8C=E9=9D=A2=EF=BC=9A=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20$refs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/infra/service/codegen/inner/CodegenEngine.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
index 933b27a46..c14edeac5 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
@@ -297,6 +297,10 @@ public class CodegenEngine {
         if (StrUtil.count(content, "dateFormatter") == 1) {
             content = StrUtils.removeLineContains(content, "dateFormatter");
         }
+        // Vue2 界面：修正 $refs
+        if (StrUtil.count(content, "this.refs") >= 1) {
+            content = content.replace("this.refs", "this.$refs");
+        }
         // Vue 界面：去除多的 dict 相关，只有一个的情况下，说明没使用到
         if (StrUtil.count(content, "getIntDictOptions") == 1) {
             content = content.replace("getIntDictOptions, ", "");

From 6d228828f4df50c20bf9a5266fe4596039dbc804 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 27 Nov 2023 16:34:55 +0800
Subject: [PATCH 08/11] =?UTF-8?q?application-local.yaml=20=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-local.yaml  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 264ad7e10..8a8a334f4 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -48,21 +48,21 @@ spring:
       primary: master
       datasource:
         master:
-          name: ruoyi-vue-pro4
+          name: ruoyi-vue-pro
           url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
-#          url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例
+          #          url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例
           username: root
           password: 123456
         #          username: sa
         #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
-#          username: SYSDBA # DM 连接的示例
-#          password: SYSDBA # DM 连接的示例
+        #          username: SYSDBA # DM 连接的示例
+        #          password: SYSDBA # DM 连接的示例
         slave: # 模拟从库，可根据自己需要修改
-          name: ruoyi-vue-pro4
+          name: ruoyi-vue-pro
           lazy: true # 开启懒加载，保证启动速度
           url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
@@ -78,8 +78,8 @@ spring:
   redis:
     host: 127.0.0.1 # 地址
     port: 6379 # 端口
-    database: 4 # 数据库索引
-    password: 123456 # 密码，建议生产环境开启
+    database: 0 # 数据库索引
+#    password: dev # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################
 
@@ -123,8 +123,8 @@ spring:
   rabbitmq:
     host: 127.0.0.1 # RabbitMQ 服务的地址
     port: 5672 # RabbitMQ 服务的端口
-    username: guest # RabbitMQ 服务的账号
-    password: guest # RabbitMQ 服务的密码
+    username: rabbit # RabbitMQ 服务的账号
+    password: rabbit # RabbitMQ 服务的密码
   # Kafka 配置项，对应 KafkaProperties 配置类
   kafka:
     bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔

From df51a678eb379b426914406a3a17e986a3a21710 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 27 Nov 2023 17:09:53 +0800
Subject: [PATCH 09/11] =?UTF-8?q?code=20review=EF=BC=9Avue2=20=E4=B8=BB?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E7=9A=84=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/codegen/vue/api/api.js.vm  |   2 +-
 .../resources/codegen/vue3/views/form.vue.vm  | 538 +++++++--------
 .../resources/codegen/vue3/views/index.vue.vm | 639 +++++++++---------
 ...st.java => CodegenEngineAbstractTest.java} | 102 +--
 .../codegen/inner/CodegenEngineVue2Test.java  | 117 +---
 .../codegen/inner/CodegenEngineVue3Test.java  |  95 +++
 6 files changed, 701 insertions(+), 792 deletions(-)
 rename yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/{CodegenEngineTest.java => CodegenEngineAbstractTest.java} (50%)
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm
index 906d12c29..bfe2dc007 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm
@@ -63,7 +63,7 @@ export function export${simpleClassName}Excel(params) {
     responseType: 'blob'
   })
 }
-## 特殊：主子表专属逻辑
+## 特殊：主子表专属逻辑 TODO @puhui999：下面方法的【空格】不太对
 #foreach ($subTable in $subTables)
   #set ($index = $foreach.count - 1)
   #set ($subSimpleClassName = $subSimpleClassNames.get($index))
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
index c1595798d..1c1553622 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
@@ -1,137 +1,137 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <el-form
-        ref="formRef"
-        :model="formData"
-        :rules="formRules"
-        label-width="100px"
-        v-loading="formLoading"
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
     >
-        #foreach($column in $columns)
-            #if ($column.createOperation || $column.updateOperation)
-                #set ($dictType = $column.dictType)
-                #set ($javaField = $column.javaField)
-                #set ($javaType = $column.javaType)
-                #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-                #set ($comment = $column.columnComment)
-                #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
-                #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-                    #set ($dictMethod = "getIntDictOptions")
-                #elseif ($javaType == "String")
-                    #set ($dictMethod = "getStrDictOptions")
-                #elseif ($javaType == "Boolean")
-                    #set ($dictMethod = "getBoolDictOptions")
-                #end
-                #if ( $table.templateType == 2 && $column.id == $treeParentColumn.id )
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <el-tree-select
-                        v-model="formData.${javaField}"
-                        :data="${classNameVar}Tree"
-                        #if ($treeNameColumn.javaField == "name")
-                        :props="defaultProps"
-                        #else
-                        :props="{...defaultProps, label: '$treeNameColumn.javaField'}"
-                        #end
-                        check-strictly
-                        default-expand-all
-                        placeholder="请选择${comment}"
-                    />
-                  </el-form-item>
-                #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
-                  </el-form-item>
-                #elseif($column.htmlType == "imageUpload")## 图片上传
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <UploadImg v-model="formData.${javaField}" />
-                  </el-form-item>
-                #elseif($column.htmlType == "fileUpload")## 文件上传
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <UploadFile v-model="formData.${javaField}" />
-                  </el-form-item>
-                #elseif($column.htmlType == "editor")## 文本编辑器
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <Editor v-model="formData.${javaField}" height="150px" />
-                  </el-form-item>
-                #elseif($column.htmlType == "select")## 下拉框
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
-                        #if ("" != $dictType)## 有数据字典
-                          <el-option
-                              v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-                              :key="dict.value"
-                              :label="dict.label"
-                              :value="dict.value"
-                          />
-                        #else##没数据字典
-                          <el-option label="请选择字典生成" value="" />
-                        #end
-                    </el-select>
-                  </el-form-item>
-                #elseif($column.htmlType == "checkbox")## 多选框
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <el-checkbox-group v-model="formData.${javaField}">
-                        #if ("" != $dictType)## 有数据字典
-                          <el-checkbox
-                              v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-                              :key="dict.value"
-                              :label="dict.value"
-                          >
-                            {{ dict.label }}
-                          </el-checkbox>
-                        #else##没数据字典
-                          <el-checkbox>请选择字典生成</el-checkbox>
-                        #end
-                    </el-checkbox-group>
-                  </el-form-item>
-                #elseif($column.htmlType == "radio")## 单选框
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <el-radio-group v-model="formData.${javaField}">
-                        #if ("" != $dictType)## 有数据字典
-                          <el-radio
-                              v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-                              :key="dict.value"
-                              :label="dict.value"
-                          >
-                            {{ dict.label }}
-                          </el-radio>
-                        #else##没数据字典
-                          <el-radio label="1">请选择字典生成</el-radio>
-                        #end
-                    </el-radio-group>
-                  </el-form-item>
-                #elseif($column.htmlType == "datetime")## 时间框
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <el-date-picker
-                        v-model="formData.${javaField}"
-                        type="date"
-                        value-format="x"
-                        placeholder="选择${comment}"
-                    />
-                  </el-form-item>
-                #elseif($column.htmlType == "textarea")## 文本框
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
-                  </el-form-item>
-                #end
-            #end
+#foreach($column in $columns)
+    #if ($column.createOperation || $column.updateOperation)
+        #set ($dictType = $column.dictType)
+        #set ($javaField = $column.javaField)
+        #set ($javaType = $column.javaType)
+        #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+        #set ($comment = $column.columnComment)
+        #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
+        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+            #set ($dictMethod = "getIntDictOptions")
+        #elseif ($javaType == "String")
+            #set ($dictMethod = "getStrDictOptions")
+        #elseif ($javaType == "Boolean")
+            #set ($dictMethod = "getBoolDictOptions")
         #end
+        #if ( $table.templateType == 2 && $column.id == $treeParentColumn.id )
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-tree-select
+          v-model="formData.${javaField}"
+          :data="${classNameVar}Tree"
+          #if ($treeNameColumn.javaField == "name")
+          :props="defaultProps"
+          #else
+          :props="{...defaultProps, label: '$treeNameColumn.javaField'}"
+          #end
+          check-strictly
+          default-expand-all
+          placeholder="请选择${comment}"
+        />
+      </el-form-item>
+        #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
+      </el-form-item>
+        #elseif($column.htmlType == "imageUpload")## 图片上传
+      <el-form-item label="${comment}" prop="${javaField}">
+        <UploadImg v-model="formData.${javaField}" />
+      </el-form-item>
+        #elseif($column.htmlType == "fileUpload")## 文件上传
+      <el-form-item label="${comment}" prop="${javaField}">
+        <UploadFile v-model="formData.${javaField}" />
+      </el-form-item>
+        #elseif($column.htmlType == "editor")## 文本编辑器
+      <el-form-item label="${comment}" prop="${javaField}">
+        <Editor v-model="formData.${javaField}" height="150px" />
+      </el-form-item>
+        #elseif($column.htmlType == "select")## 下拉框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
+                #if ("" != $dictType)## 有数据字典
+          <el-option
+            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+                #else##没数据字典
+          <el-option label="请选择字典生成" value="" />
+                #end
+        </el-select>
+      </el-form-item>
+        #elseif($column.htmlType == "checkbox")## 多选框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-checkbox-group v-model="formData.${javaField}">
+                #if ("" != $dictType)## 有数据字典
+          <el-checkbox
+            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-checkbox>
+                #else##没数据字典
+          <el-checkbox>请选择字典生成</el-checkbox>
+                #end
+        </el-checkbox-group>
+      </el-form-item>
+        #elseif($column.htmlType == "radio")## 单选框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-radio-group v-model="formData.${javaField}">
+                #if ("" != $dictType)## 有数据字典
+          <el-radio
+            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+                #else##没数据字典
+          <el-radio label="1">请选择字典生成</el-radio>
+                #end
+        </el-radio-group>
+      </el-form-item>
+        #elseif($column.htmlType == "datetime")## 时间框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-date-picker
+          v-model="formData.${javaField}"
+          type="date"
+          value-format="x"
+          placeholder="选择${comment}"
+        />
+      </el-form-item>
+        #elseif($column.htmlType == "textarea")## 文本框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
+      </el-form-item>
+        #end
+    #end
+#end
     </el-form>
-      ## 特殊：主子表专属逻辑
-      #if ( $table.templateType == 10 || $table.templateType == 12 )
-        <!-- 子表的表单 -->
-        <el-tabs v-model="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))
-              <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
-                <${subSimpleClassName}Form ref="${subClassNameVar}FormRef" :${subJoinColumn_strikeCase}="formData.id" />
-              </el-tab-pane>
-            #end
-        </el-tabs>
-      #end
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 10 || $table.templateType == 12 )
+    <!-- 子表的表单 -->
+    <el-tabs v-model="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))
+      <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
+        <${subSimpleClassName}Form ref="${subClassNameVar}FormRef" :${subJoinColumn_strikeCase}="formData.id" />
+      </el-tab-pane>
+    #end
+    </el-tabs>
+#end
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -139,160 +139,160 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-  import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
-  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
-      ## 特殊：树表专属逻辑
-      #if ( $table.templateType == 2 )
-      import { defaultProps, handleTree } from '@/utils/tree'
-      #end
-      ## 特殊：主子表专属逻辑
-      #if ( $table.templateType == 10 || $table.templateType == 12 )
-          #foreach ($subSimpleClassName in $subSimpleClassNames)
-          import ${subSimpleClassName}Form from './components/${subSimpleClassName}Form.vue'
-          #end
-      #end
+import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+## 特殊：树表专属逻辑
+#if ( $table.templateType == 2 )
+import { defaultProps, handleTree } from '@/utils/tree'
+#end
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 10 || $table.templateType == 12 )
+#foreach ($subSimpleClassName in $subSimpleClassNames)
+import ${subSimpleClassName}Form from './components/${subSimpleClassName}Form.vue'
+#end
+#end
 
-  const { t } = useI18n() // 国际化
-  const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
 
-  const dialogVisible = ref(false) // 弹窗的是否展示
-  const dialogTitle = ref('') // 弹窗的标题
-  const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-  const formType = ref('') // 表单的类型：create - 新增；update - 修改
-  const formData = ref({
-      #foreach ($column in $columns)
-          #if ($column.createOperation || $column.updateOperation)
-              #if ($column.htmlType == "checkbox")
-                      $column.javaField: [],
-              #else
-                      $column.javaField: undefined,
-              #end
-          #end
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+#foreach ($column in $columns)
+    #if ($column.createOperation || $column.updateOperation)
+      #if ($column.htmlType == "checkbox")
+  $column.javaField: [],
+      #else
+  $column.javaField: undefined,
       #end
-  })
-  const formRules = reactive({
-      #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
-  })
-  const formRef = ref() // 表单 Ref
-      ## 特殊：树表专属逻辑
-      #if ( $table.templateType == 2 )
-      const ${classNameVar}Tree = ref() // 树形结构
-      #end
-      ## 特殊：主子表专属逻辑
-      #if ( $table.templateType == 10 || $table.templateType == 12 )
-          #if ( $subTables && $subTables.size() > 0 )
+    #end
+#end
+})
+const formRules = reactive({
+#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
+})
+const formRef = ref() // 表单 Ref
+## 特殊：树表专属逻辑
+#if ( $table.templateType == 2 )
+const ${classNameVar}Tree = ref() // 树形结构
+#end
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 10 || $table.templateType == 12 )
+#if ( $subTables && $subTables.size() > 0 )
 
-          /** 子表的表单 */
-          const subTabsName = ref('$subClassNameVars.get(0)')
-              #foreach ($subClassNameVar in $subClassNameVars)
-              const ${subClassNameVar}FormRef = ref()
-              #end
-          #end
-      #end
+/** 子表的表单 */
+const subTabsName = ref('$subClassNameVars.get(0)')
+#foreach ($subClassNameVar in $subClassNameVars)
+const ${subClassNameVar}FormRef = ref()
+#end
+#end
+#end
 
-  /** 打开弹窗 */
-  const open = async (type: string, id?: number) => {
-    dialogVisible.value = true
-    dialogTitle.value = t('action.' + type)
-    formType.value = type
-    resetForm()
-    // 修改时，设置数据
-    if (id) {
-      formLoading.value = true
-      try {
-        formData.value = await ${simpleClassName}Api.get${simpleClassName}(id)
-      } finally {
-        formLoading.value = false
-      }
-    }
-      ## 特殊：树表专属逻辑
-      #if ( $table.templateType == 2 )
-        await get${simpleClassName}Tree()
-      #end
-  }
-  defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-  /** 提交表单 */
-  const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-  const submitForm = async () => {
-    // 校验表单
-    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))
-                try {
-                  await ${subClassNameVar}FormRef.value.validate()
-                } catch (e) {
-                  subTabsName.value = '${subClassNameVar}'
-                  return
-                }
-              #end
-          #end
-      #end
-    // 提交请求
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
     formLoading.value = true
     try {
-      const data = formData.value as unknown as ${simpleClassName}Api.${simpleClassName}VO
-        ## 特殊：主子表专属逻辑
-        #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))
-                  data.${subClassNameVar}#if ( $subTable.subJoinMany)s#end = ${subClassNameVar}FormRef.value.getData()
-                #end
-            #end
-        #end
-      if (formType.value === 'create') {
-        await ${simpleClassName}Api.create${simpleClassName}(data)
-        message.success(t('common.createSuccess'))
-      } else {
-        await ${simpleClassName}Api.update${simpleClassName}(data)
-        message.success(t('common.updateSuccess'))
-      }
-      dialogVisible.value = false
-      // 发送操作成功的事件
-      emit('success')
+      formData.value = await ${simpleClassName}Api.get${simpleClassName}(id)
     } finally {
       formLoading.value = false
     }
   }
+## 特殊：树表专属逻辑
+#if ( $table.templateType == 2 )
+  await get${simpleClassName}Tree()
+#end
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-  /** 重置表单 */
-  const 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()
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  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))
+  try {
+    await ${subClassNameVar}FormRef.value.validate()
+  } catch (e) {
+    subTabsName.value = '${subClassNameVar}'
+    return
   }
-      ## 特殊：树表专属逻辑
-      #if ( $table.templateType == 2 )
+  #end
+#end
+#end
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ${simpleClassName}Api.${simpleClassName}VO
+## 特殊：主子表专属逻辑
+#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))
+    data.${subClassNameVar}#if ( $subTable.subJoinMany)s#end = ${subClassNameVar}FormRef.value.getData()
+  #end
+#end
+#end
+    if (formType.value === 'create') {
+      await ${simpleClassName}Api.create${simpleClassName}(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ${simpleClassName}Api.update${simpleClassName}(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
 
-      /** 获得${table.classComment}树 */
-      const get${simpleClassName}Tree = async () => {
-              ${classNameVar}Tree.value = []
-        const data = await ${simpleClassName}Api.get${simpleClassName}List()
-        const root: Tree = { id: 0, name: '顶级${table.classComment}', children: [] }
-        root.children = handleTree(data, 'id', '${treeParentColumn.javaField}')
-              ${classNameVar}Tree.value.push(root)
-      }
+/** 重置表单 */
+const 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}树 */
+const get${simpleClassName}Tree = async () => {
+  ${classNameVar}Tree.value = []
+  const data = await ${simpleClassName}Api.get${simpleClassName}List()
+  const root: Tree = { id: 0, name: '顶级${table.classComment}', children: [] }
+  root.children = handleTree(data, 'id', '${treeParentColumn.javaField}')
+  ${classNameVar}Tree.value.push(root)
+}
+#end
 </script>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index d7794b0ff..eab90c12a 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -2,375 +2,372 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
-        class="-mb-15px"
-        :model="queryParams"
-        ref="queryFormRef"
-        :inline="true"
-        label-width="68px"
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
     >
-        #foreach($column in $columns)
-            #if ($column.listOperation)
-                #set ($dictType = $column.dictType)
-                #set ($javaField = $column.javaField)
-                #set ($javaType = $column.javaType)
-                #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-                #set ($comment = $column.columnComment)
-                #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
-                #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-                    #set ($dictMethod = "getIntDictOptions")
-                #elseif ($javaType == "String")
-                    #set ($dictMethod = "getStrDictOptions")
-                #elseif ($javaType == "Boolean")
-                    #set ($dictMethod = "getBoolDictOptions")
-                #end
-                #if ($column.htmlType == "input")
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <el-input
-                        v-model="queryParams.${javaField}"
-                        placeholder="请输入${comment}"
-                        clearable
-                        @keyup.enter="handleQuery"
-                        class="!w-240px"
-                    />
-                  </el-form-item>
-                #elseif ($column.htmlType == "select" || $column.htmlType == "radio")
-                  <el-form-item label="${comment}" prop="${javaField}">
-                    <el-select
-                        v-model="queryParams.${javaField}"
-                        placeholder="请选择${comment}"
-                        clearable
-                        class="!w-240px"
-                    >
-                        #if ("" != $dictType)## 设置了 dictType 数据字典的情况
-                          <el-option
-                              v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-                              :key="dict.value"
-                              :label="dict.label"
-                              :value="dict.value"
-                          />
-                        #else## 未设置 dictType 数据字典的情况
-                          <el-option label="请选择字典生成" value="" />
-                        #end
-                    </el-select>
-                  </el-form-item>
-                #elseif($column.htmlType == "datetime")
-                    #if ($column.listOperationCondition != "BETWEEN")## 非范围
-                      <el-form-item label="${comment}" prop="${javaField}">
-                        <el-date-picker
-                            v-model="queryParams.${javaField}"
-                            value-format="YYYY-MM-DD"
-                            type="date"
-                            placeholder="选择${comment}"
-                            clearable
-                            class="!w-240px"
-                        />
-                      </el-form-item>
-                    #else## 范围
-                      <el-form-item label="${comment}" prop="${javaField}">
-                        <el-date-picker
-                            v-model="queryParams.${javaField}"
-                            value-format="YYYY-MM-DD HH:mm:ss"
-                            type="daterange"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-                            class="!w-240px"
-                        />
-                      </el-form-item>
-                    #end
-                #end
+    #foreach($column in $columns)
+        #if ($column.listOperation)
+            #set ($dictType = $column.dictType)
+            #set ($javaField = $column.javaField)
+            #set ($javaType = $column.javaType)
+            #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            #set ($comment = $column.columnComment)
+            #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
+            #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                #set ($dictMethod = "getIntDictOptions")
+            #elseif ($javaType == "String")
+                #set ($dictMethod = "getStrDictOptions")
+            #elseif ($javaType == "Boolean")
+                #set ($dictMethod = "getBoolDictOptions")
             #end
-        #end
+            #if ($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-input
+          v-model="queryParams.${javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+            #elseif ($column.htmlType == "select" || $column.htmlType == "radio")
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-select
+          v-model="queryParams.${javaField}"
+          placeholder="请选择${comment}"
+          clearable
+          class="!w-240px"
+        >
+                #if ("" != $dictType)## 设置了 dictType 数据字典的情况
+          <el-option
+            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+                #else## 未设置 dictType 数据字典的情况
+          <el-option label="请选择字典生成" value="" />
+                #end
+        </el-select>
+      </el-form-item>
+    #elseif($column.htmlType == "datetime")
+      #if ($column.listOperationCondition != "BETWEEN")## 非范围
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-date-picker
+          v-model="queryParams.${javaField}"
+          value-format="YYYY-MM-DD"
+          type="date"
+          placeholder="选择${comment}"
+          clearable
+          class="!w-240px"
+        />
+      </el-form-item>
+      #else## 范围
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-date-picker
+          v-model="queryParams.${javaField}"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      #end
+    #end
+    #end
+    #end
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
         <el-button
-            type="primary"
-            plain
-            @click="openForm('create')"
-            v-hasPermi="['${permissionPrefix}:create']"
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['${permissionPrefix}:create']"
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
         <el-button
-            type="success"
-            plain
-            @click="handleExport"
-            :loading="exportLoading"
-            v-hasPermi="['${permissionPrefix}:export']"
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['${permissionPrefix}:export']"
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
-          ## 特殊：树表专属逻辑
-          #if ( $table.templateType == 2 )
-            <el-button type="danger" plain @click="toggleExpandAll">
-              <Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
-            </el-button>
-          #end
+## 特殊：树表专属逻辑
+#if ( $table.templateType == 2 )
+        <el-button type="danger" plain @click="toggleExpandAll">
+          <Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
+        </el-button>
+#end
       </el-form-item>
     </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
-      ## 特殊：主子表专属逻辑
-      #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
-      <el-table
-          v-loading="loading"
-          :data="list"
-          :stripe="true"
-          :show-overflow-tooltip="true"
-          highlight-current-row
-          @current-change="handleCurrentChange"
-      >
-          ## 特殊：树表专属逻辑
-      #elseif ( $table.templateType == 2 )
-      <el-table
-          v-loading="loading"
-          :data="list"
-          :stripe="true"
-          :show-overflow-tooltip="true"
-          row-key="id"
-          :default-expand-all="isExpandAll"
-          v-if="refreshTable"
-      >
-      #else
-      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      #end
-      ## 特殊：主子表专属逻辑
-      #if ( $table.templateType == 12 && $subTables && $subTables.size() > 0 )
-        <!-- 子表的列表 -->
-        <el-table-column type="expand">
-          <template #default="scope">
-            <el-tabs model-value="$subClassNameVars.get(0)">
-                #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))
-                  <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
-                    <${subSimpleClassName}List :${subJoinColumn_strikeCase}="scope.row.id" />
-                  </el-tab-pane>
-                #end
-            </el-tabs>
-          </template>
-        </el-table-column>
-      #end
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      highlight-current-row
+      @current-change="handleCurrentChange"
+    >
+## 特殊：树表专属逻辑
+#elseif ( $table.templateType == 2 )
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      row-key="id"
+      :default-expand-all="isExpandAll"
+      v-if="refreshTable"
+    >
+#else
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+#end
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 12 && $subTables && $subTables.size() > 0 )
+      <!-- 子表的列表 -->
+      <el-table-column type="expand">
+        <template #default="scope">
+          <el-tabs model-value="$subClassNameVars.get(0)">
+            #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))
+            <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
+              <${subSimpleClassName}List :${subJoinColumn_strikeCase}="scope.row.id" />
+            </el-tab-pane>
+            #end
+          </el-tabs>
+        </template>
+      </el-table-column>
+#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")## 时间类型
-                <el-table-column
-                    label="${comment}"
-                    align="center"
-                    prop="${javaField}"
-                    :formatter="dateFormatter"
-                    width="180px"
-                />
-              #elseif($column.dictType && "" != $column.dictType)## 数据字典
-                <el-table-column label="${comment}" align="center" prop="${javaField}">
-                  <template #default="scope">
-                    <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.${column.javaField}" />
-                  </template>
-                </el-table-column>
-              #else
-                <el-table-column label="${comment}" align="center" prop="${javaField}" />
-              #end
-          #end
+      #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")## 时间类型
+      <el-table-column
+        label="${comment}"
+        align="center"
+        prop="${javaField}"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+        #elseif($column.dictType && "" != $column.dictType)## 数据字典
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.${column.javaField}" />
+        </template>
+      </el-table-column>
+        #else
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+        #end
       #end
-    <el-table-column label="操作" align="center">
-      <template #default="scope">
-        <el-button
+    #end
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
             v-hasPermi="['${permissionPrefix}:update']"
-        >
-          编辑
-        </el-button>
-        <el-button
+          >
+            编辑
+          </el-button>
+          <el-button
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
             v-hasPermi="['${permissionPrefix}:delete']"
-        >
-          删除
-        </el-button>
-      </template>
-    </el-table-column>
-  </el-table>
-## 特殊：树表专属逻辑（树不需要分页）
-#if ( $table.templateType != 2 )
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
     <!-- 分页 -->
     <Pagination
-        :total="total"
-        v-model:page="queryParams.pageNo"
-        v-model:limit="queryParams.pageSize"
-        @pagination="getList"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
     />
-#end
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
   <${simpleClassName}Form ref="formRef" @success="getList" />
-    ## 特殊：主子表专属逻辑
-    #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
-      <!-- 子表的列表 -->
-      <ContentWrap>
-        <el-tabs model-value="$subClassNameVars.get(0)">
-            #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))
-              <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
-                <${subSimpleClassName}List :${subJoinColumn_strikeCase}="currentRow.id" />
-              </el-tab-pane>
-            #end
-        </el-tabs>
-      </ContentWrap>
-    #end
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
+  <!-- 子表的列表 -->
+  <ContentWrap>
+    <el-tabs model-value="$subClassNameVars.get(0)">
+      #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))
+      <el-tab-pane label="${subTable.classComment}" name="$subClassNameVar">
+        <${subSimpleClassName}List :${subJoinColumn_strikeCase}="currentRow.id" />
+      </el-tab-pane>
+      #end
+    </el-tabs>
+  </ContentWrap>
+#end
 </template>
 
 <script setup lang="ts">
-  import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
-  import { dateFormatter } from '@/utils/formatTime'
-      ## 特殊：树表专属逻辑
-      #if ( $table.templateType == 2 )
-      import { handleTree } from '@/utils/tree'
-      #end
-  import download from '@/utils/download'
-  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
-  import ${simpleClassName}Form from './${simpleClassName}Form.vue'
-      ## 特殊：主子表专属逻辑
-      #if ( $table.templateType != 10 )
-          #foreach ($subSimpleClassName in $subSimpleClassNames)
-          import ${subSimpleClassName}List from './components/${subSimpleClassName}List.vue'
-          #end
-      #end
+import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+## 特殊：树表专属逻辑
+#if ( $table.templateType == 2 )
+import { handleTree } from '@/utils/tree'
+#end
+import download from '@/utils/download'
+import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+import ${simpleClassName}Form from './${simpleClassName}Form.vue'
+## 特殊：主子表专属逻辑
+#if ( $table.templateType != 10 )
+#foreach ($subSimpleClassName in $subSimpleClassNames)
+import ${subSimpleClassName}List from './components/${subSimpleClassName}List.vue'
+#end
+#end
 
-  defineOptions({ name: '${table.className}' })
+defineOptions({ name: '${table.className}' })
 
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
 
-  const loading = ref(true) // 列表的加载中
-  const list = ref([]) // 列表的数据
-      ## 特殊：树表专属逻辑（树不需要分页接口）
-      #if ( $table.templateType != 2 )
-      const total = ref(0) // 列表的总页数
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+## 特殊：树表专属逻辑（树不需要分页接口）
+#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: null,
+  #end
+      #if ($column.htmlType == "datetime" || $column.listOperationCondition == "BETWEEN")
+  $column.javaField: [],
       #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: null,
-              #end
-              #if ($column.htmlType == "datetime" || $column.listOperationCondition == "BETWEEN")
-                      $column.javaField: [],
-              #end
-          #end
-      #end
-  })
-  const queryFormRef = ref() // 搜索的表单
-  const exportLoading = ref(false) // 导出的加载中
+    #end
+  #end
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
 
-  /** 查询列表 */
-  const getList = async () => {
-    loading.value = true
-    try {
-        ## 特殊：树表专属逻辑（树不需要分页接口）
-        #if ( $table.templateType == 2 )
-          const data = await ${simpleClassName}Api.get${simpleClassName}List(queryParams)
-          list.value = handleTree(data, 'id', '${treeParentColumn.javaField}')
-        #else
-          const data = await ${simpleClassName}Api.get${simpleClassName}Page(queryParams)
-          list.value = data.list
-          total.value = data.total
-        #end
-    } finally {
-      loading.value = false
-    }
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+## 特殊：树表专属逻辑（树不需要分页接口）
+  #if ( $table.templateType == 2 )
+    const data = await ${simpleClassName}Api.get${simpleClassName}List(queryParams)
+    list.value = handleTree(data, 'id', '${treeParentColumn.javaField}')
+  #else
+    const data = await ${simpleClassName}Api.get${simpleClassName}Page(queryParams)
+    list.value = data.list
+    total.value = data.total
+  #end
+  } finally {
+    loading.value = false
   }
+}
 
-  /** 搜索按钮操作 */
-  const handleQuery = () => {
-    queryParams.pageNo = 1
-    getList()
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ${simpleClassName}Api.delete${simpleClassName}(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ${simpleClassName}Api.export${simpleClassName}(queryParams)
+    download.excel(data, '${table.classComment}.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
+}
+## 特殊：主子表专属逻辑
+#if ( $table.templateType == 11 )
 
-  /** 重置按钮操作 */
-  const resetQuery = () => {
-    queryFormRef.value.resetFields()
-    handleQuery()
-  }
+/** 选中行操作 */
+const currentRow = ref({}) // 选中行
+const handleCurrentChange = (row) => {
+  currentRow.value = row
+}
+#end
+## 特殊：树表专属逻辑
+#if ( $table.templateType == 2 )
 
-  /** 添加/修改操作 */
-  const formRef = ref()
-  const openForm = (type: string, id?: number) => {
-    formRef.value.open(type, id)
-  }
+/** 展开/折叠操作 */
+const isExpandAll = ref(true) // 是否展开，默认全部展开
+const refreshTable = ref(true) // 重新渲染表格状态
+const toggleExpandAll = async () => {
+  refreshTable.value = false
+  isExpandAll.value = !isExpandAll.value
+  await nextTick()
+  refreshTable.value = true
+}
+#end
 
-  /** 删除按钮操作 */
-  const handleDelete = async (id: number) => {
-    try {
-      // 删除的二次确认
-      await message.delConfirm()
-      // 发起删除
-      await ${simpleClassName}Api.delete${simpleClassName}(id)
-      message.success(t('common.delSuccess'))
-      // 刷新列表
-      await getList()
-    } catch {}
-  }
-
-  /** 导出按钮操作 */
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await ${simpleClassName}Api.export${simpleClassName}(queryParams)
-      download.excel(data, '${table.classComment}.xls')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
-  }
-      ## 特殊：主子表专属逻辑
-      #if ( $table.templateType == 11 )
-
-      /** 选中行操作 */
-      const currentRow = ref({}) // 选中行
-      const handleCurrentChange = (row) => {
-        currentRow.value = row
-      }
-      #end
-      ## 特殊：树表专属逻辑
-      #if ( $table.templateType == 2 )
-
-      /** 展开/折叠操作 */
-      const isExpandAll = ref(true) // 是否展开，默认全部展开
-      const refreshTable = ref(true) // 重新渲染表格状态
-      const toggleExpandAll = async () => {
-        refreshTable.value = false
-        isExpandAll.value = !isExpandAll.value
-        await nextTick()
-        refreshTable.value = true
-      }
-      #end
-
-  /** 初始化 **/
-  onMounted(() => {
-    getList()
-  })
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
 </script>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java
similarity index 50%
rename from yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineTest.java
rename to yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java
index 7c5a87724..588f2b08b 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java
@@ -10,33 +10,32 @@ import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
-import cn.iocoder.yudao.module.infra.enums.codegen.*;
 import cn.iocoder.yudao.module.infra.framework.codegen.config.CodegenProperties;
-import org.apache.ibatis.type.JdbcType;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Spy;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
- * {@link CodegenEngine} 的单元测试
+ * {@link CodegenEngine} 的单元测试抽象基类
  *
  * @author 芋道源码
  */
-public class CodegenEngineTest extends BaseMockitoUnitTest {
+public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest {
 
     @InjectMocks
-    private CodegenEngine codegenEngine;
+    protected CodegenEngine codegenEngine;
 
     @Spy
-    private CodegenProperties codegenProperties = new CodegenProperties()
+    protected CodegenProperties codegenProperties = new CodegenProperties()
             .setBasePackage("cn.iocoder.yudao");
 
     @BeforeEach
@@ -44,87 +43,12 @@ public class CodegenEngineTest extends BaseMockitoUnitTest {
         codegenEngine.initGlobalBindingMap();
     }
 
-    @Test
-    public void testExecute_vue3_one() {
-        // 准备参数
-        CodegenTableDO table = getTable("student")
-                .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
-                .setTemplateType(CodegenTemplateTypeEnum.ONE.getType());
-        List<CodegenColumnDO> columns = getColumnList("student");
-
-        // 调用
-        Map<String, String> result = codegenEngine.execute(table, columns, null, null);
-        // 断言
-        assertResult(result, "codegen/vue3_one");
-//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one");
-    }
-
-    @Test
-    public void testExecute_vue3_tree() {
-        // 准备参数
-        CodegenTableDO table = getTable("category")
-                .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
-                .setTemplateType(CodegenTemplateTypeEnum.TREE.getType());
-        List<CodegenColumnDO> columns = getColumnList("category");
-
-        // 调用
-        Map<String, String> result = codegenEngine.execute(table, columns, null, null);
-        // 断言
-        assertResult(result, "codegen/vue3_tree");
-//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree");
-//        writeFile(result, "/Users/yunai/test/demo66.zip");
-    }
-
-    @Test
-    public void testExecute_vue3_master_normal() {
-        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_NORMAL, "codegen/vue3_master_normal");
-    }
-
-    @Test
-    public void testExecute_vue3_master_erp() {
-        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_ERP, "codegen/vue3_master_erp");
-    }
-
-    @Test
-    public void testExecute_vue3_master_inner() {
-        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_INNER, "codegen/vue3_master_inner");
-    }
-
-    private void testExecute_vue3_master(CodegenTemplateTypeEnum templateType,
-                                         String path) {
-        // 准备参数
-        CodegenTableDO table = getTable("student")
-                .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
-                .setTemplateType(templateType.getType());
-        List<CodegenColumnDO> columns = getColumnList("student");
-        // 准备参数（子表）
-        CodegenTableDO contactTable = getTable("contact")
-                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
-                .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
-                .setSubJoinColumnId(100L).setSubJoinMany(true);
-        List<CodegenColumnDO> contactColumns = getColumnList("contact");
-        // 准备参数（班主任）
-        CodegenTableDO teacherTable = getTable("teacher")
-                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
-                .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
-                .setSubJoinColumnId(200L).setSubJoinMany(false);
-        List<CodegenColumnDO> teacherColumns = getColumnList("teacher");
-
-        // 调用
-        Map<String, String> result = codegenEngine.execute(table, columns,
-                Arrays.asList(contactTable, teacherTable), Arrays.asList(contactColumns, teacherColumns));
-        // 断言
-        assertResult(result, path);
-//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/" + path);
-//        writeFile(result, "/Users/yunai/test/demo11.zip");
-    }
-
-    private static CodegenTableDO getTable(String name) {
+    protected static CodegenTableDO getTable(String name) {
         String content = ResourceUtil.readUtf8Str("codegen/table/" + name + ".json");
         return JsonUtils.parseObject(content, "table", CodegenTableDO.class);
     }
 
-    private static List<CodegenColumnDO> getColumnList(String name) {
+    protected static List<CodegenColumnDO> getColumnList(String name) {
         String content = ResourceUtil.readUtf8Str("codegen/table/" + name + ".json");
         List<CodegenColumnDO> list = JsonUtils.parseArray(content, "columns", CodegenColumnDO.class);
         list.forEach(column -> {
@@ -148,7 +72,7 @@ public class CodegenEngineTest extends BaseMockitoUnitTest {
     }
 
     @SuppressWarnings("rawtypes")
-    private static void assertResult(Map<String, String> result, String path) {
+    protected static void assertResult(Map<String, String> result, String path) {
         String assertContent = ResourceUtil.readUtf8Str(path + "/assert.json");
         List<HashMap> asserts = JsonUtils.parseArray(assertContent, HashMap.class);
         assertEquals(asserts.size(), result.size());
@@ -169,7 +93,7 @@ public class CodegenEngineTest extends BaseMockitoUnitTest {
      * @param result 生成的代码
      * @param path 写入文件的路径
      */
-    private void writeFile(Map<String, String> result, String path) {
+    protected void writeFile(Map<String, String> result, String path) {
         // 生成压缩包
         String[] paths = result.keySet().toArray(new String[0]);
         ByteArrayInputStream[] ins = result.values().stream().map(IoUtil::toUtf8Stream).toArray(ByteArrayInputStream[]::new);
@@ -185,7 +109,7 @@ public class CodegenEngineTest extends BaseMockitoUnitTest {
      * @param result 生成的代码
      * @param basePath 写入文件的路径（绝对路径）
      */
-    private void writeResult(Map<String, String> result, String basePath) {
+    protected void writeResult(Map<String, String> result, String basePath) {
         // 写入文件内容
         List<Map<String, String>> asserts = new ArrayList<>();
         result.forEach((filePath, fileContent) -> {
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java
index 9513362b4..aaaf17e6c 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java
@@ -1,47 +1,21 @@
 package cn.iocoder.yudao.module.infra.service.codegen.inner;
 
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.ZipUtil;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
 import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum;
 import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum;
-import cn.iocoder.yudao.module.infra.framework.codegen.config.CodegenProperties;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Spy;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.*;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
- * {@link CodegenEngine} 的单元测试
+ * {@link CodegenEngine} 的 Vue2 + Element UI 单元测试
  *
  * @author 芋道源码
  */
-public class CodegenEngineVue2Test extends BaseMockitoUnitTest {
-
-    @InjectMocks
-    private CodegenEngine codegenEngine;
-
-    @Spy
-    private CodegenProperties codegenProperties = new CodegenProperties()
-            .setBasePackage("cn.iocoder.yudao");
-
-    @BeforeEach
-    public void setUp() {
-        codegenEngine.initGlobalBindingMap();
-    }
+public class CodegenEngineVue2Test extends CodegenEngineAbstractTest {
 
     @Test
     public void testExecute_vue2_one() {
@@ -118,85 +92,4 @@ public class CodegenEngineVue2Test extends BaseMockitoUnitTest {
 //        writeFile(result, "/Users/yunai/test/demo11.zip");
     }
 
-    private static CodegenTableDO getTable(String name) {
-        String content = ResourceUtil.readUtf8Str("codegen/table/" + name + ".json");
-        return JsonUtils.parseObject(content, "table", CodegenTableDO.class);
-    }
-
-    private static List<CodegenColumnDO> getColumnList(String name) {
-        String content = ResourceUtil.readUtf8Str("codegen/table/" + name + ".json");
-        List<CodegenColumnDO> list = JsonUtils.parseArray(content, "columns", CodegenColumnDO.class);
-        list.forEach(column -> {
-            if (column.getNullable() == null) {
-                column.setNullable(false);
-            }
-            if (column.getCreateOperation() == null) {
-                column.setCreateOperation(false);
-            }
-            if (column.getUpdateOperation() == null) {
-                column.setUpdateOperation(false);
-            }
-            if (column.getListOperation() == null) {
-                column.setListOperation(false);
-            }
-            if (column.getListOperationResult() == null) {
-                column.setListOperationResult(false);
-            }
-        });
-        return list;
-    }
-
-    @SuppressWarnings("rawtypes")
-    private static void assertResult(Map<String, String> result, String path) {
-        String assertContent = ResourceUtil.readUtf8Str(path + "/assert.json");
-        List<HashMap> asserts = JsonUtils.parseArray(assertContent, HashMap.class);
-        assertEquals(asserts.size(), result.size());
-        // 校验每个文件
-        asserts.forEach(assertMap -> {
-            String contentPath = (String) assertMap.get("contentPath");
-            String filePath = (String) assertMap.get("filePath");
-            String content = ResourceUtil.readUtf8Str(path + "/" + contentPath);
-            assertEquals(content, result.get(filePath), filePath + "：不匹配");
-        });
-    }
-
-    // ==================== 调试专用 ====================
-
-    /**
-     * 【调试使用】将生成的代码，写入到文件
-     *
-     * @param result 生成的代码
-     * @param path 写入文件的路径
-     */
-    private void writeFile(Map<String, String> result, String path) {
-        // 生成压缩包
-        String[] paths = result.keySet().toArray(new String[0]);
-        ByteArrayInputStream[] ins = result.values().stream().map(IoUtil::toUtf8Stream).toArray(ByteArrayInputStream[]::new);
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ZipUtil.zip(outputStream, paths, ins);
-        // 写入文件
-        FileUtil.writeBytes(outputStream.toByteArray(), path);
-    }
-
-    /**
-     * 【调试使用】将生成的结果，写入到文件
-     *
-     * @param result 生成的代码
-     * @param basePath 写入文件的路径（绝对路径）
-     */
-    private void writeResult(Map<String, String> result, String basePath) {
-        // 写入文件内容
-        List<Map<String, String>> asserts = new ArrayList<>();
-        result.forEach((filePath, fileContent) -> {
-            String lastFilePath = StrUtil.subAfter(filePath, '/', true);
-            String contentPath = StrUtil.subAfter(lastFilePath, '.', true)
-                    + '/' + StrUtil.subBefore(lastFilePath, '.', true);
-            asserts.add(MapUtil.<String, String>builder().put("filePath", filePath)
-                    .put("contentPath", contentPath).build());
-            FileUtil.writeUtf8String(fileContent, basePath + "/" + contentPath);
-        });
-        // 写入 assert.json 文件
-        FileUtil.writeUtf8String(JsonUtils.toJsonPrettyString(asserts), basePath +"/assert.json");
-    }
-
 }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java
new file mode 100644
index 000000000..56ad78aec
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java
@@ -0,0 +1,95 @@
+package cn.iocoder.yudao.module.infra.service.codegen.inner;
+
+import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
+import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum;
+import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@link CodegenEngine} 的 Vue2 + Element Plus 单元测试
+ *
+ * @author 芋道源码
+ */
+public class CodegenEngineVue3Test extends CodegenEngineAbstractTest {
+
+    @Test
+    public void testExecute_vue3_one() {
+        // 准备参数
+        CodegenTableDO table = getTable("student")
+                .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
+                .setTemplateType(CodegenTemplateTypeEnum.ONE.getType());
+        List<CodegenColumnDO> columns = getColumnList("student");
+
+        // 调用
+        Map<String, String> result = codegenEngine.execute(table, columns, null, null);
+        // 断言
+        assertResult(result, "codegen/vue3_one");
+//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one");
+    }
+
+    @Test
+    public void testExecute_vue3_tree() {
+        // 准备参数
+        CodegenTableDO table = getTable("category")
+                .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
+                .setTemplateType(CodegenTemplateTypeEnum.TREE.getType());
+        List<CodegenColumnDO> columns = getColumnList("category");
+
+        // 调用
+        Map<String, String> result = codegenEngine.execute(table, columns, null, null);
+        // 断言
+        assertResult(result, "codegen/vue3_tree");
+//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree");
+//        writeFile(result, "/Users/yunai/test/demo66.zip");
+    }
+
+    @Test
+    public void testExecute_vue3_master_normal() {
+        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_NORMAL, "codegen/vue3_master_normal");
+    }
+
+    @Test
+    public void testExecute_vue3_master_erp() {
+        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_ERP, "codegen/vue3_master_erp");
+    }
+
+    @Test
+    public void testExecute_vue3_master_inner() {
+        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_INNER, "codegen/vue3_master_inner");
+    }
+
+    private void testExecute_vue3_master(CodegenTemplateTypeEnum templateType,
+                                         String path) {
+        // 准备参数
+        CodegenTableDO table = getTable("student")
+                .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
+                .setTemplateType(templateType.getType());
+        List<CodegenColumnDO> columns = getColumnList("student");
+        // 准备参数（子表）
+        CodegenTableDO contactTable = getTable("contact")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
+                .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
+                .setSubJoinColumnId(100L).setSubJoinMany(true);
+        List<CodegenColumnDO> contactColumns = getColumnList("contact");
+        // 准备参数（班主任）
+        CodegenTableDO teacherTable = getTable("teacher")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
+                .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
+                .setSubJoinColumnId(200L).setSubJoinMany(false);
+        List<CodegenColumnDO> teacherColumns = getColumnList("teacher");
+
+        // 调用
+        Map<String, String> result = codegenEngine.execute(table, columns,
+                Arrays.asList(contactTable, teacherTable), Arrays.asList(contactColumns, teacherColumns));
+        // 断言
+        assertResult(result, path);
+//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/" + path);
+//        writeFile(result, "/Users/yunai/test/demo11.zip");
+    }
+
+}

From 5ebebf15792afac523df275d7653cff703db1c2d Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 27 Nov 2023 21:05:41 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9Avue2=20=E4=BB=A3=E7=A0=81=E6=A8=A1=E6=8B=9F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue/views/components/form_sub_erp.vue.vm  |  2 +-
 .../views/components/form_sub_normal.vue.vm   | 24 +++++++-------
 .../vue/views/components/list_sub_erp.vue.vm  |  4 +--
 .../resources/codegen/vue/views/form.vue.vm   | 14 ++++----
 .../resources/codegen/vue/views/index.vue.vm  | 33 +++++++++----------
 5 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
index eb32690b4..99aa91af1 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm
@@ -89,7 +89,7 @@
 </template>
 
 <script>
-  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}';
       #if ($hasImageUploadColumn)
       import ImageUpload from '@/components/ImageUpload';
       #end
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
index d8051d545..48a404a3b 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm
@@ -8,12 +8,12 @@
   <div class="app-container">
     #if ( $subTable.subJoinMany )## 情况一：一对多，table + form
       <el-form
-          ref="formRef"
-          :model="formData"
-          :rules="formRules"
-          v-loading="formLoading"
-          label-width="0px"
-          :inline-message="true"
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        v-loading="formLoading"
+        label-width="0px"
+        :inline-message="true"
       >
         <el-table :data="formData" class="-mt-10px">
           <el-table-column label="序号" type="index" width="100" />
@@ -137,11 +137,11 @@
       </el-row>
     #else## 情况二：一对一，form
       <el-form
-          ref="formRef"
-          :model="formData"
-          :rules="formRules"
-          label-width="100px"
-          v-loading="formLoading"
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="100px"
+        v-loading="formLoading"
       >
           #foreach($column in $subColumns)
               #if ($column.createOperation || $column.updateOperation)
@@ -221,7 +221,7 @@
 </template>
 
 <script>
-  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}';
       #if ($hasImageUploadColumn)
       import ImageUpload from '@/components/ImageUpload';
       #end
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
index c08e53032..589736b6e 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm
@@ -61,9 +61,9 @@
 </template>
 
 <script>
-  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}';
   #if ($table.templateType == 11)
-  import ${subSimpleClassName}Form from './${subSimpleClassName}Form.vue'
+  import ${subSimpleClassName}Form from './${subSimpleClassName}Form.vue';
   #end
   export default {
     name: "${subSimpleClassName}List",
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
index 27911acf2..634d05d3b 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm
@@ -12,10 +12,10 @@
                   #if ( $table.templateType == 2 && $column.id == $treeParentColumn.id )
                     <el-form-item label="${comment}" prop="${javaField}">
                       <TreeSelect
-                          v-model="formData.${javaField}"
-                          :options="${classNameVar}Tree"
-                          :normalizer="normalizer"
-                          placeholder="请选择${comment}"
+                        v-model="formData.${javaField}"
+                        :options="${classNameVar}Tree"
+                        :normalizer="normalizer"
+                        placeholder="请选择${comment}"
                       />
                     </el-form-item>
                   #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
@@ -107,7 +107,7 @@
 </template>
 
 <script>
-  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}';
   #if ($hasImageUploadColumn)
   import ImageUpload from '@/components/ImageUpload';
   #end
@@ -212,7 +212,7 @@
         this.title = "新增${table.classComment}";
         ## 特殊：树表专属逻辑
         #if ( $table.templateType == 2 )
-            this.get${simpleClassName}Tree();
+        await this.get${simpleClassName}Tree();
         #end
       },
       /** 提交按钮 */
@@ -263,7 +263,7 @@
           this.#[[$modal]]#.msgSuccess("新增成功");
           this.dialogVisible = false;
           this.#[[$]]#emit('success');
-        }finally {
+        } finally {
           this.formLoading = false;
         }
       },
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
index 1e55d6b16..2328007a0 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 #foreach($column in $columns)
@@ -68,24 +67,24 @@
       ## 特殊：主子表专属逻辑
       #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
       <el-table
-          v-loading="loading"
-          :data="list"
-          :stripe="true"
-          :highlight-current-row="true"
-          :show-overflow-tooltip="true"
-          @current-change="handleCurrentChange"
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :highlight-current-row="true"
+        :show-overflow-tooltip="true"
+        @current-change="handleCurrentChange"
       >
           ## 特殊：树表专属逻辑
       #elseif ( $table.templateType == 2 )
       <el-table
-          v-loading="loading"
-          :data="list"
-          :stripe="true"
-          :show-overflow-tooltip="true"
-          v-if="refreshTable"
-          row-key="id"
-          :default-expand-all="isExpandAll"
-          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        v-if="refreshTable"
+        row-key="id"
+        :default-expand-all="isExpandAll"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       >
       #else
       <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
@@ -183,7 +182,7 @@ import Editor from '@/components/Editor';
 #if ( $table.templateType != 10 )
 #if ( $subTables && $subTables.size() > 0 )
     #foreach ($subSimpleClassName in $subSimpleClassNames)
-    import ${subSimpleClassName}List from './components/${subSimpleClassName}List.vue'
+    import ${subSimpleClassName}List from './components/${subSimpleClassName}List.vue';
     #end
 #end
 #end
@@ -298,7 +297,7 @@ export default {
       await this.#[[$modal]]#.confirm('是否确认删除${table.classComment}编号为"' + ${primaryColumn.javaField} + '"的数据项?')
       try {
        await ${simpleClassName}Api.delete${simpleClassName}(${primaryColumn.javaField});
-       this.getList();
+       await this.getList();
        this.#[[$modal]]#.msgSuccess("删除成功");
       } catch {}
     },

From c437201236dd16a63802bbbb504cbc9173e9ed79 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 27 Nov 2023 21:15:32 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9ACodegenEngineVue2Test=20=E6=89=80=E9=9C=80=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue2_master_erp/vue/StudentContactForm    |  36 +++---
 .../vue2_master_erp/vue/StudentContactList    |  31 ++---
 .../codegen/vue2_master_erp/vue/StudentForm   |  57 ++++-----
 .../vue2_master_erp/vue/StudentTeacherForm    |  36 +++---
 .../vue2_master_erp/vue/StudentTeacherList    |  31 ++---
 .../codegen/vue2_master_erp/vue/index         |  56 ++++-----
 .../vue2_master_inner/vue/StudentContactForm  |  27 +++--
 .../vue2_master_inner/vue/StudentContactList  |  10 +-
 .../codegen/vue2_master_inner/vue/StudentForm | 111 ++++++------------
 .../vue2_master_inner/vue/StudentTeacherForm  |  19 +--
 .../vue2_master_inner/vue/StudentTeacherList  |  18 ++-
 .../codegen/vue2_master_inner/vue/index       |  44 +++----
 .../vue2_master_normal/vue/StudentContactForm |  27 +++--
 .../vue2_master_normal/vue/StudentForm        | 111 ++++++------------
 .../vue2_master_normal/vue/StudentTeacherForm |  19 +--
 .../codegen/vue2_master_normal/vue/index      |  40 +++----
 .../codegen/vue2_one/vue/StudentForm          |  57 ++++-----
 .../test/resources/codegen/vue2_one/vue/index |  40 +++----
 .../codegen/vue2_tree/vue/CategoryForm        |  81 +++++--------
 .../resources/codegen/vue2_tree/vue/index     |  54 ++++-----
 20 files changed, 355 insertions(+), 550 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactForm
index 2117eead6..de3b0a734 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactForm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactForm
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
       import ImageUpload from '@/components/ImageUpload';
       import FileUpload from '@/components/FileUpload';
       import Editor from '@/components/Editor';
@@ -90,19 +90,17 @@
     },
     methods: {
       /** 打开弹窗 */
-      open(id, studentId) {
+      async open(id, studentId) {
         this.dialogVisible = true;
         this.reset();
-        const that = this;
         this.formData.studentId = studentId;
         // 修改时，设置数据
         if (id) {
           this.formLoading = true;
           try {
-              StudentApi.getStudentContact(id).then(res=>{
-              that.formData = res.data;
-              that.dialogTitle = "修改学生联系人";
-            })
+            const res = await StudentApi.getStudentContact(id);
+            this.formData = res.data;
+            this.dialogTitle = "修改学生联系人";
           } finally {
             this.formLoading = false;
           }
@@ -110,32 +108,26 @@
         this.dialogTitle = "新增学生联系人";
       },
       /** 提交按钮 */
-      submitForm() {
+      async submitForm() {
+        await this.$refs["formRef"].validate();
         this.formLoading = true;
         try {
-          let data = this.formData;
-          this.$refs["formRef"].validate(valid => {
-            if (!valid) {
-              return;
-            }
+            const data = this.formData;
             // 修改的提交
             if (data.id) {
-              StudentApi.updateStudentContact(data).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.dialogVisible = false;
-                this.$emit('success');
-              });
+            await  StudentApi.updateStudentContact(data);
+            this.$modal.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.$emit('success');
               return;
             }
             // 添加的提交
-            StudentApi.createStudentContact(data).then(response => {
+              await StudentApi.createStudentContact(data);
               this.$modal.msgSuccess("新增成功");
               this.dialogVisible = false;
               this.$emit('success');
-            });
-          });
         }finally {
-          this.formLoading = false
+          this.formLoading = false;
         }
       },
       /** 表单重置 */
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactList
index e0178b1bb..00f1ce040 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactList
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactList
@@ -52,8 +52,8 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
-  import StudentContactForm from './StudentContactForm.vue'
+  import * as StudentApi from '@/api/infra/demo';
+  import StudentContactForm from './StudentContactForm.vue';
   export default {
     name: "StudentContactList",
     components: {
@@ -91,14 +91,12 @@
     },
     methods: {
       /** 查询列表 */
-      getList() {
+      async getList() {
         try {
           this.loading = true;
-          const that = this;
-          StudentApi.getStudentContactPage(this.queryParams).then(response => {
-            that.list = response.data.list;
-            that.total = response.data.total;
-          });
+            const res = await StudentApi.getStudentContactPage(this.queryParams);
+            this.list = res.data.list;
+            this.total = res.data.total;
         } finally {
           this.loading = false;
         }
@@ -111,22 +109,19 @@
       /** 添加/修改操作 */
       openForm(id) {
         if (!this.studentId) {
-          that.$modal.msgError('请选择一个学生');
+          this.$modal.msgError('请选择一个学生');
           return;
         }
         this.$refs["formRef"].open(id, this.studentId);
       },
       /** 删除按钮操作 */
-      handleDelete(row) {
-        const that = this;
+      async handleDelete(row) {
+        const id = row.id;
+        await this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?');
         try {
-          const id = row.id;
-          this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
-            return StudentApi.deleteStudentContact(id);
-          }).then(() => {
-            that.getList();
-            that.$modal.msgSuccess("删除成功");
-          }).catch(() => {});
+          await StudentApi.deleteStudentContact(id);
+          await this.getList();
+          this.$modal.msgSuccess("删除成功");
         } catch {}
       },
     }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentForm
index f6b171860..d89e5066d 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentForm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentForm
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
   import ImageUpload from '@/components/ImageUpload';
   import FileUpload from '@/components/FileUpload';
   import Editor from '@/components/Editor';
@@ -89,18 +89,16 @@
     },
     methods: {
       /** 打开弹窗 */
-     open(id) {
+     async open(id) {
         this.dialogVisible = true;
         this.reset();
-        const that = this;
         // 修改时，设置数据
         if (id) {
           this.formLoading = true;
           try {
-            StudentApi.getStudent(id).then(res=>{
-              that.formData = res.data;
-              that.title = "修改学生";
-            })
+            const res = await StudentApi.getStudent(id);
+            this.formData = res.data;
+            this.title = "修改学生";
           } finally {
             this.formLoading = false;
           }
@@ -108,41 +106,28 @@
         this.title = "新增学生";
               },
       /** 提交按钮 */
-      submitForm() {
-        this.formLoading = true;
+      async submitForm() {
+        // 校验主表
+        await this.$refs["formRef"].validate();
+                  this.formLoading = true;
         try {
-          const that = this;
-          let data = this.formData;
-          let validate = false;
-          // 校验主表
-          this.getRef("formRef").validate(valid => {
-            validate = valid;
-          });
-                  // 所有表单校验通过后方可提交
-          if (!validate) {
-            return;
-          }
-          // 修改的提交
+          const data = this.formData;
+                  // 修改的提交
           if (data.id) {
-                  StudentApi.updateStudent(data).then(response => {
-              that.$modal.msgSuccess("修改成功");
-              that.dialogVisible = false;
-              that.$emit('success');
-            });
+            await StudentApi.updateStudent(data);
+            this.$modal.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.$emit('success');
             return;
           }
           // 添加的提交
-          StudentApi.createStudent(data).then(response => {
-            that.$modal.msgSuccess("新增成功");
-            that.dialogVisible = false;
-            that.$emit('success');
-          });
-        }finally {
+          await StudentApi.createStudent(data);
+          this.$modal.msgSuccess("新增成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+        } finally {
           this.formLoading = false;
         }
-      },
-      getRef(refName){
-        return this.$refs[refName];
       },
                       /** 表单重置 */
       reset() {
@@ -158,7 +143,7 @@
                             memo: undefined,
         };
         this.resetForm("formRef");
-      },
+      }
     }
   };
 </script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherForm
index cf86657e1..874a03bbc 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherForm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherForm
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
       import ImageUpload from '@/components/ImageUpload';
       import FileUpload from '@/components/FileUpload';
       import Editor from '@/components/Editor';
@@ -90,19 +90,17 @@
     },
     methods: {
       /** 打开弹窗 */
-      open(id, studentId) {
+      async open(id, studentId) {
         this.dialogVisible = true;
         this.reset();
-        const that = this;
         this.formData.studentId = studentId;
         // 修改时，设置数据
         if (id) {
           this.formLoading = true;
           try {
-              StudentApi.getStudentTeacher(id).then(res=>{
-              that.formData = res.data;
-              that.dialogTitle = "修改学生班主任";
-            })
+            const res = await StudentApi.getStudentTeacher(id);
+            this.formData = res.data;
+            this.dialogTitle = "修改学生班主任";
           } finally {
             this.formLoading = false;
           }
@@ -110,32 +108,26 @@
         this.dialogTitle = "新增学生班主任";
       },
       /** 提交按钮 */
-      submitForm() {
+      async submitForm() {
+        await this.$refs["formRef"].validate();
         this.formLoading = true;
         try {
-          let data = this.formData;
-          this.$refs["formRef"].validate(valid => {
-            if (!valid) {
-              return;
-            }
+            const data = this.formData;
             // 修改的提交
             if (data.id) {
-              StudentApi.updateStudentTeacher(data).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.dialogVisible = false;
-                this.$emit('success');
-              });
+            await  StudentApi.updateStudentTeacher(data);
+            this.$modal.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.$emit('success');
               return;
             }
             // 添加的提交
-            StudentApi.createStudentTeacher(data).then(response => {
+              await StudentApi.createStudentTeacher(data);
               this.$modal.msgSuccess("新增成功");
               this.dialogVisible = false;
               this.$emit('success');
-            });
-          });
         }finally {
-          this.formLoading = false
+          this.formLoading = false;
         }
       },
       /** 表单重置 */
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherList
index 271afbeb3..7d561a0ee 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherList
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherList
@@ -52,8 +52,8 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
-  import StudentTeacherForm from './StudentTeacherForm.vue'
+  import * as StudentApi from '@/api/infra/demo';
+  import StudentTeacherForm from './StudentTeacherForm.vue';
   export default {
     name: "StudentTeacherList",
     components: {
@@ -91,14 +91,12 @@
     },
     methods: {
       /** 查询列表 */
-      getList() {
+      async getList() {
         try {
           this.loading = true;
-          const that = this;
-          StudentApi.getStudentTeacherPage(this.queryParams).then(response => {
-            that.list = response.data.list;
-            that.total = response.data.total;
-          });
+            const res = await StudentApi.getStudentTeacherPage(this.queryParams);
+            this.list = res.data.list;
+            this.total = res.data.total;
         } finally {
           this.loading = false;
         }
@@ -111,22 +109,19 @@
       /** 添加/修改操作 */
       openForm(id) {
         if (!this.studentId) {
-          that.$modal.msgError('请选择一个学生');
+          this.$modal.msgError('请选择一个学生');
           return;
         }
         this.$refs["formRef"].open(id, this.studentId);
       },
       /** 删除按钮操作 */
-      handleDelete(row) {
-        const that = this;
+      async handleDelete(row) {
+        const id = row.id;
+        await this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?');
         try {
-          const id = row.id;
-          this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
-            return StudentApi.deleteStudentTeacher(id);
-          }).then(() => {
-            that.getList();
-            that.$modal.msgSuccess("删除成功");
-          }).catch(() => {});
+          await StudentApi.deleteStudentTeacher(id);
+          await this.getList();
+          this.$modal.msgSuccess("删除成功");
         } catch {}
       },
     }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/index
index 528bf1589..9c7588f2a 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/index
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/index
@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="名字" prop="name">
@@ -45,12 +44,12 @@
     </el-row>
 
             <el-table
-          v-loading="loading"
-          :data="list"
-          :stripe="true"
-          :highlight-current-row="true"
-          :show-overflow-tooltip="true"
-          @current-change="handleCurrentChange"
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :highlight-current-row="true"
+        :show-overflow-tooltip="true"
+        @current-change="handleCurrentChange"
       >
                       <el-table-column label="编号" align="center" prop="id">
         <template v-slot="scope">
@@ -131,8 +130,8 @@
 <script>
 import * as StudentApi from '@/api/infra/demo';
 import StudentForm from './StudentForm.vue';
-    import StudentContactList from './components/StudentContactList.vue'
-    import StudentTeacherList from './components/StudentTeacherList.vue'
+    import StudentContactList from './components/StudentContactList.vue';
+    import StudentTeacherList from './components/StudentTeacherList.vue';
 export default {
   name: "Student",
   components: {
@@ -177,13 +176,12 @@ export default {
   },
   methods: {
     /** 查询列表 */
-    getList() {
+    async getList() {
       try {
       this.loading = true;
-            StudentApi.getStudentPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-      });
+              const res = await StudentApi.getStudentPage(this.queryParams);
+        this.list = res.data.list;
+        this.total = res.data.total;
       } finally {
         this.loading = false;
       }
@@ -203,31 +201,25 @@ export default {
       this.$refs["formRef"].open(id);
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
-      const that = this;
-      try {
+    async handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
-          return StudentApi.deleteStudent(id);
-        }).then(() => {
-        that.getList();
-        that.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      await this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?')
+      try {
+       await StudentApi.deleteStudent(id);
+       await this.getList();
+       this.$modal.msgSuccess("删除成功");
       } catch {}
     },
     /** 导出按钮操作 */
-    handleExport() {
-      const that = this;
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有学生数据项?');
       try {
-          this.$modal.confirm('是否确认导出所有学生数据项?').then(() => {
-              that.exportLoading = true;
-              return StudentApi.exportStudentExcel(params);
-            }).then(response => {
-              that.$download.excel(response, '学生.xls');
-            });
+        this.exportLoading = true;
+        const res = await StudentApi.exportStudentExcel(this.queryParams);
+        this.$download.excel(res.data, '学生.xls');
       } catch {
       } finally {
-        that.exportLoading = false;
+        this.exportLoading = false;
       }
     },
               /** 选中行操作 */
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactForm
index 1e57837a4..c953bfa13 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactForm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactForm
@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
       <el-form
-          ref="formRef"
-          :model="formData"
-          :rules="formRules"
-          v-loading="formLoading"
-          label-width="0px"
-          :inline-message="true"
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        v-loading="formLoading"
+        label-width="0px"
+        :inline-message="true"
       >
         <el-table :data="formData" class="-mt-10px">
           <el-table-column label="序号" type="index" width="100" />
@@ -86,7 +86,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
       import ImageUpload from '@/components/ImageUpload';
       import FileUpload from '@/components/FileUpload';
       import Editor from '@/components/Editor';
@@ -130,8 +130,9 @@
           }
           try {
             this.formLoading = true;
+            // 这里还是需要获取一下 this 的不然取不到 formData
             const that = this;
-            StudentApi.getStudentContactListByStudentId(val).then(res=>{
+            StudentApi.getStudentContactListByStudentId(val).then(function (res){
               that.formData = res.data;
             })
           } finally {
@@ -156,20 +157,20 @@
                                 video: undefined,
                                 memo: undefined,
             }
-            row.studentId = this.studentId
-            this.formData.push(row)
+            row.studentId = this.studentId;
+            this.formData.push(row);
           },
           /** 删除按钮操作 */
           handleDelete(index) {
-            this.formData.splice(index, 1)
+            this.formData.splice(index, 1);
           },
       /** 表单校验 */
       validate(){
-        return this.$refs["formRef"].validate()
+        return this.$refs["formRef"].validate();
       },
       /** 表单值 */
       getData(){
-        return this.formData
+        return this.formData;
       }
     }
   };
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactList
index 6afac6d26..c0a8710e9 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactList
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactList
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
   export default {
     name: "StudentContactList",
     props:[
@@ -70,13 +70,11 @@
     },
     methods: {
       /** 查询列表 */
-      getList() {
+      async getList() {
         try {
           this.loading = true;
-          const that = this;
-                StudentApi.getStudentContactListByStudentId(this.studentId).then(response=>{
-                  that.list = response.data;
-              })
+                const res = await StudentApi.getStudentContactListByStudentId(this.studentId);
+                this.list = res.data;
         } finally {
           this.loading = false;
         }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentForm
index 140db4beb..6d93b6122 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentForm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentForm
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
   import ImageUpload from '@/components/ImageUpload';
   import FileUpload from '@/components/FileUpload';
   import Editor from '@/components/Editor';
@@ -104,18 +104,16 @@
     },
     methods: {
       /** 打开弹窗 */
-     open(id) {
+     async open(id) {
         this.dialogVisible = true;
         this.reset();
-        const that = this;
         // 修改时，设置数据
         if (id) {
           this.formLoading = true;
           try {
-            StudentApi.getStudent(id).then(res=>{
-              that.formData = res.data;
-              that.title = "修改学生";
-            })
+            const res = await StudentApi.getStudent(id);
+            this.formData = res.data;
+            this.title = "修改学生";
           } finally {
             this.formLoading = false;
           }
@@ -123,83 +121,44 @@
         this.title = "新增学生";
               },
       /** 提交按钮 */
-      submitForm() {
+      async submitForm() {
+        // 校验主表
+        await this.$refs["formRef"].validate();
+                          // 校验子表
+                    try {
+                                            await this.$refs['studentContactFormRef'].validate();
+                    } catch (e) {
+                      this.subTabsName = 'studentContact';
+                      return;
+                    }
+                    try {
+                                            await this.$refs['studentTeacherFormRef'].validate();
+                    } catch (e) {
+                      this.subTabsName = 'studentTeacher';
+                      return;
+                    }
         this.formLoading = true;
         try {
-          const that = this;
-          let data = this.formData;
-          let validate = false;
-          // 校验主表
-          this.getRef("formRef").validate(valid => {
-            validate = valid;
-          });
-                    // 校验子表
-            this.validateSubFrom01().then(() => {
-            // 全部校验通过-拼接子表的数据
-            // 拼接子表的数据
-                data.studentContacts = that.getRef('studentContactFormRef').getData();
-                data.studentTeacher = that.getRef('studentTeacherFormRef').getData();
-            }).catch((err) => {
-                validate = false;
-                that.subTabsName = err.replace("FormRef", ""); // 定位到没有校验通过的子表单
-            })
-          // 所有表单校验通过后方可提交
-          if (!validate) {
-            return;
-          }
+          const data = this.formData;
+                    // 拼接子表的数据
+              data.studentContacts = this.$refs['studentContactFormRef'].getData();
+              data.studentTeacher = this.$refs['studentTeacherFormRef'].getData();
           // 修改的提交
           if (data.id) {
-                  StudentApi.updateStudent(data).then(response => {
-              that.$modal.msgSuccess("修改成功");
-              that.dialogVisible = false;
-              that.$emit('success');
-            });
+            await StudentApi.updateStudent(data);
+            this.$modal.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.$emit('success');
             return;
           }
           // 添加的提交
-          StudentApi.createStudent(data).then(response => {
-            that.$modal.msgSuccess("新增成功");
-            that.dialogVisible = false;
-            that.$emit('success');
-          });
-        }finally {
+          await StudentApi.createStudent(data);
+          this.$modal.msgSuccess("新增成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+        } finally {
           this.formLoading = false;
         }
-      },
-      getRef(refName){
-        return this.$refs[refName];
-      },
-      /** 校验子表单 */
-      validateSubFrom(item) {
-        return new Promise((resolve, reject) => {
-          this.getRef(item).validate()
-          .then(() => {
-            resolve();
-          })
-          .catch(() => {
-            reject(item);
-          })
-        })
-      },
-      /** 校验所有子表单 */
-      validateSubFrom01() {
-        // 需要校验的表单 ref
-        const validFormRefArr = [
-              "studentContactFormRef",
-              "studentTeacherFormRef",
-        ];
-        const validArr = []; // 校验
-        for (const item of validFormRefArr) {
-          validArr.push(this.validateSubFrom(item));
-        }
-        return new Promise((resolve, reject) => {
-          // 校验所有
-          Promise.all(validArr).then(() => {
-            resolve();
-          }).catch((err) => {
-            reject(err);
-          })
-        })
       },
                       /** 表单重置 */
       reset() {
@@ -215,7 +174,7 @@
                             memo: undefined,
         };
         this.resetForm("formRef");
-      },
+      }
     }
   };
 </script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherForm
index 48d145bb7..0dac19bb3 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherForm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherForm
@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
       <el-form
-          ref="formRef"
-          :model="formData"
-          :rules="formRules"
-          label-width="100px"
-          v-loading="formLoading"
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="100px"
+        v-loading="formLoading"
       >
                      <el-form-item label="名字" prop="name">
                       <el-input v-model="formData.name" placeholder="请输入名字" />
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
       import ImageUpload from '@/components/ImageUpload';
       import FileUpload from '@/components/FileUpload';
       import Editor from '@/components/Editor';
@@ -97,8 +97,9 @@
           }
           try {
             this.formLoading = true;
+            // 这里还是需要获取一下 this 的不然取不到 formData
             const that = this;
-            StudentApi.getStudentTeacherByStudentId(val).then(res=>{
+            StudentApi.getStudentTeacherByStudentId(val).then(function (res){
               const data = res.data;
               if (!data) {
                 return
@@ -115,11 +116,11 @@
     methods: {
       /** 表单校验 */
       validate(){
-        return this.$refs["formRef"].validate()
+        return this.$refs["formRef"].validate();
       },
       /** 表单值 */
       getData(){
-        return this.formData
+        return this.formData;
       }
     }
   };
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherList
index be77322a7..9f572742d 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherList
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherList
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
   export default {
     name: "StudentTeacherList",
     props:[
@@ -70,17 +70,15 @@
     },
     methods: {
       /** 查询列表 */
-      getList() {
+      async getList() {
         try {
           this.loading = true;
-          const that = this;
-                StudentApi.getStudentTeacherByStudentId(this.studentId).then(response=>{
-                  const data = response.data;
-                  if (!data) {
-                    return
-                  }
-                  that.list.push(data)
-              })
+                const res = await  StudentApi.getStudentTeacherByStudentId(this.studentId);
+                const data = res.data;
+                if (!data) {
+                  return;
+                }
+                this.list.push(data);
         } finally {
           this.loading = false;
         }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/index
index 9787c5182..ddeafdf29 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/index
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/index
@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="名字" prop="name">
@@ -128,8 +127,8 @@
 <script>
 import * as StudentApi from '@/api/infra/demo';
 import StudentForm from './StudentForm.vue';
-    import StudentContactList from './components/StudentContactList.vue'
-    import StudentTeacherList from './components/StudentTeacherList.vue'
+    import StudentContactList from './components/StudentContactList.vue';
+    import StudentTeacherList from './components/StudentTeacherList.vue';
 export default {
   name: "Student",
   components: {
@@ -172,13 +171,12 @@ export default {
   },
   methods: {
     /** 查询列表 */
-    getList() {
+    async getList() {
       try {
       this.loading = true;
-            StudentApi.getStudentPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-      });
+              const res = await StudentApi.getStudentPage(this.queryParams);
+        this.list = res.data.list;
+        this.total = res.data.total;
       } finally {
         this.loading = false;
       }
@@ -198,31 +196,25 @@ export default {
       this.$refs["formRef"].open(id);
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
-      const that = this;
-      try {
+    async handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
-          return StudentApi.deleteStudent(id);
-        }).then(() => {
-        that.getList();
-        that.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      await this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?')
+      try {
+       await StudentApi.deleteStudent(id);
+       await this.getList();
+       this.$modal.msgSuccess("删除成功");
       } catch {}
     },
     /** 导出按钮操作 */
-    handleExport() {
-      const that = this;
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有学生数据项?');
       try {
-          this.$modal.confirm('是否确认导出所有学生数据项?').then(() => {
-              that.exportLoading = true;
-              return StudentApi.exportStudentExcel(params);
-            }).then(response => {
-              that.$download.excel(response, '学生.xls');
-            });
+        this.exportLoading = true;
+        const res = await StudentApi.exportStudentExcel(this.queryParams);
+        this.$download.excel(res.data, '学生.xls');
       } catch {
       } finally {
-        that.exportLoading = false;
+        this.exportLoading = false;
       }
     },
               }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentContactForm
index 1e57837a4..c953bfa13 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentContactForm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentContactForm
@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
       <el-form
-          ref="formRef"
-          :model="formData"
-          :rules="formRules"
-          v-loading="formLoading"
-          label-width="0px"
-          :inline-message="true"
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        v-loading="formLoading"
+        label-width="0px"
+        :inline-message="true"
       >
         <el-table :data="formData" class="-mt-10px">
           <el-table-column label="序号" type="index" width="100" />
@@ -86,7 +86,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
       import ImageUpload from '@/components/ImageUpload';
       import FileUpload from '@/components/FileUpload';
       import Editor from '@/components/Editor';
@@ -130,8 +130,9 @@
           }
           try {
             this.formLoading = true;
+            // 这里还是需要获取一下 this 的不然取不到 formData
             const that = this;
-            StudentApi.getStudentContactListByStudentId(val).then(res=>{
+            StudentApi.getStudentContactListByStudentId(val).then(function (res){
               that.formData = res.data;
             })
           } finally {
@@ -156,20 +157,20 @@
                                 video: undefined,
                                 memo: undefined,
             }
-            row.studentId = this.studentId
-            this.formData.push(row)
+            row.studentId = this.studentId;
+            this.formData.push(row);
           },
           /** 删除按钮操作 */
           handleDelete(index) {
-            this.formData.splice(index, 1)
+            this.formData.splice(index, 1);
           },
       /** 表单校验 */
       validate(){
-        return this.$refs["formRef"].validate()
+        return this.$refs["formRef"].validate();
       },
       /** 表单值 */
       getData(){
-        return this.formData
+        return this.formData;
       }
     }
   };
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentForm
index 140db4beb..6d93b6122 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentForm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentForm
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
   import ImageUpload from '@/components/ImageUpload';
   import FileUpload from '@/components/FileUpload';
   import Editor from '@/components/Editor';
@@ -104,18 +104,16 @@
     },
     methods: {
       /** 打开弹窗 */
-     open(id) {
+     async open(id) {
         this.dialogVisible = true;
         this.reset();
-        const that = this;
         // 修改时，设置数据
         if (id) {
           this.formLoading = true;
           try {
-            StudentApi.getStudent(id).then(res=>{
-              that.formData = res.data;
-              that.title = "修改学生";
-            })
+            const res = await StudentApi.getStudent(id);
+            this.formData = res.data;
+            this.title = "修改学生";
           } finally {
             this.formLoading = false;
           }
@@ -123,83 +121,44 @@
         this.title = "新增学生";
               },
       /** 提交按钮 */
-      submitForm() {
+      async submitForm() {
+        // 校验主表
+        await this.$refs["formRef"].validate();
+                          // 校验子表
+                    try {
+                                            await this.$refs['studentContactFormRef'].validate();
+                    } catch (e) {
+                      this.subTabsName = 'studentContact';
+                      return;
+                    }
+                    try {
+                                            await this.$refs['studentTeacherFormRef'].validate();
+                    } catch (e) {
+                      this.subTabsName = 'studentTeacher';
+                      return;
+                    }
         this.formLoading = true;
         try {
-          const that = this;
-          let data = this.formData;
-          let validate = false;
-          // 校验主表
-          this.getRef("formRef").validate(valid => {
-            validate = valid;
-          });
-                    // 校验子表
-            this.validateSubFrom01().then(() => {
-            // 全部校验通过-拼接子表的数据
-            // 拼接子表的数据
-                data.studentContacts = that.getRef('studentContactFormRef').getData();
-                data.studentTeacher = that.getRef('studentTeacherFormRef').getData();
-            }).catch((err) => {
-                validate = false;
-                that.subTabsName = err.replace("FormRef", ""); // 定位到没有校验通过的子表单
-            })
-          // 所有表单校验通过后方可提交
-          if (!validate) {
-            return;
-          }
+          const data = this.formData;
+                    // 拼接子表的数据
+              data.studentContacts = this.$refs['studentContactFormRef'].getData();
+              data.studentTeacher = this.$refs['studentTeacherFormRef'].getData();
           // 修改的提交
           if (data.id) {
-                  StudentApi.updateStudent(data).then(response => {
-              that.$modal.msgSuccess("修改成功");
-              that.dialogVisible = false;
-              that.$emit('success');
-            });
+            await StudentApi.updateStudent(data);
+            this.$modal.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.$emit('success');
             return;
           }
           // 添加的提交
-          StudentApi.createStudent(data).then(response => {
-            that.$modal.msgSuccess("新增成功");
-            that.dialogVisible = false;
-            that.$emit('success');
-          });
-        }finally {
+          await StudentApi.createStudent(data);
+          this.$modal.msgSuccess("新增成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+        } finally {
           this.formLoading = false;
         }
-      },
-      getRef(refName){
-        return this.$refs[refName];
-      },
-      /** 校验子表单 */
-      validateSubFrom(item) {
-        return new Promise((resolve, reject) => {
-          this.getRef(item).validate()
-          .then(() => {
-            resolve();
-          })
-          .catch(() => {
-            reject(item);
-          })
-        })
-      },
-      /** 校验所有子表单 */
-      validateSubFrom01() {
-        // 需要校验的表单 ref
-        const validFormRefArr = [
-              "studentContactFormRef",
-              "studentTeacherFormRef",
-        ];
-        const validArr = []; // 校验
-        for (const item of validFormRefArr) {
-          validArr.push(this.validateSubFrom(item));
-        }
-        return new Promise((resolve, reject) => {
-          // 校验所有
-          Promise.all(validArr).then(() => {
-            resolve();
-          }).catch((err) => {
-            reject(err);
-          })
-        })
       },
                       /** 表单重置 */
       reset() {
@@ -215,7 +174,7 @@
                             memo: undefined,
         };
         this.resetForm("formRef");
-      },
+      }
     }
   };
 </script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentTeacherForm
index 48d145bb7..0dac19bb3 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentTeacherForm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentTeacherForm
@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
       <el-form
-          ref="formRef"
-          :model="formData"
-          :rules="formRules"
-          label-width="100px"
-          v-loading="formLoading"
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="100px"
+        v-loading="formLoading"
       >
                      <el-form-item label="名字" prop="name">
                       <el-input v-model="formData.name" placeholder="请输入名字" />
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
       import ImageUpload from '@/components/ImageUpload';
       import FileUpload from '@/components/FileUpload';
       import Editor from '@/components/Editor';
@@ -97,8 +97,9 @@
           }
           try {
             this.formLoading = true;
+            // 这里还是需要获取一下 this 的不然取不到 formData
             const that = this;
-            StudentApi.getStudentTeacherByStudentId(val).then(res=>{
+            StudentApi.getStudentTeacherByStudentId(val).then(function (res){
               const data = res.data;
               if (!data) {
                 return
@@ -115,11 +116,11 @@
     methods: {
       /** 表单校验 */
       validate(){
-        return this.$refs["formRef"].validate()
+        return this.$refs["formRef"].validate();
       },
       /** 表单值 */
       getData(){
-        return this.formData
+        return this.formData;
       }
     }
   };
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/index
index dfdf41b09..460758127 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/index
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/index
@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="名字" prop="name">
@@ -155,13 +154,12 @@ export default {
   },
   methods: {
     /** 查询列表 */
-    getList() {
+    async getList() {
       try {
       this.loading = true;
-            StudentApi.getStudentPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-      });
+              const res = await StudentApi.getStudentPage(this.queryParams);
+        this.list = res.data.list;
+        this.total = res.data.total;
       } finally {
         this.loading = false;
       }
@@ -181,31 +179,25 @@ export default {
       this.$refs["formRef"].open(id);
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
-      const that = this;
-      try {
+    async handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
-          return StudentApi.deleteStudent(id);
-        }).then(() => {
-        that.getList();
-        that.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      await this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?')
+      try {
+       await StudentApi.deleteStudent(id);
+       await this.getList();
+       this.$modal.msgSuccess("删除成功");
       } catch {}
     },
     /** 导出按钮操作 */
-    handleExport() {
-      const that = this;
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有学生数据项?');
       try {
-          this.$modal.confirm('是否确认导出所有学生数据项?').then(() => {
-              that.exportLoading = true;
-              return StudentApi.exportStudentExcel(params);
-            }).then(response => {
-              that.$download.excel(response, '学生.xls');
-            });
+        this.exportLoading = true;
+        const res = await StudentApi.exportStudentExcel(this.queryParams);
+        this.$download.excel(res.data, '学生.xls');
       } catch {
       } finally {
-        that.exportLoading = false;
+        this.exportLoading = false;
       }
     },
               }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/StudentForm
index f6b171860..d89e5066d 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/StudentForm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/StudentForm
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-  import * as StudentApi from '@/api/infra/demo'
+  import * as StudentApi from '@/api/infra/demo';
   import ImageUpload from '@/components/ImageUpload';
   import FileUpload from '@/components/FileUpload';
   import Editor from '@/components/Editor';
@@ -89,18 +89,16 @@
     },
     methods: {
       /** 打开弹窗 */
-     open(id) {
+     async open(id) {
         this.dialogVisible = true;
         this.reset();
-        const that = this;
         // 修改时，设置数据
         if (id) {
           this.formLoading = true;
           try {
-            StudentApi.getStudent(id).then(res=>{
-              that.formData = res.data;
-              that.title = "修改学生";
-            })
+            const res = await StudentApi.getStudent(id);
+            this.formData = res.data;
+            this.title = "修改学生";
           } finally {
             this.formLoading = false;
           }
@@ -108,41 +106,28 @@
         this.title = "新增学生";
               },
       /** 提交按钮 */
-      submitForm() {
-        this.formLoading = true;
+      async submitForm() {
+        // 校验主表
+        await this.$refs["formRef"].validate();
+                  this.formLoading = true;
         try {
-          const that = this;
-          let data = this.formData;
-          let validate = false;
-          // 校验主表
-          this.getRef("formRef").validate(valid => {
-            validate = valid;
-          });
-                  // 所有表单校验通过后方可提交
-          if (!validate) {
-            return;
-          }
-          // 修改的提交
+          const data = this.formData;
+                  // 修改的提交
           if (data.id) {
-                  StudentApi.updateStudent(data).then(response => {
-              that.$modal.msgSuccess("修改成功");
-              that.dialogVisible = false;
-              that.$emit('success');
-            });
+            await StudentApi.updateStudent(data);
+            this.$modal.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.$emit('success');
             return;
           }
           // 添加的提交
-          StudentApi.createStudent(data).then(response => {
-            that.$modal.msgSuccess("新增成功");
-            that.dialogVisible = false;
-            that.$emit('success');
-          });
-        }finally {
+          await StudentApi.createStudent(data);
+          this.$modal.msgSuccess("新增成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+        } finally {
           this.formLoading = false;
         }
-      },
-      getRef(refName){
-        return this.$refs[refName];
       },
                       /** 表单重置 */
       reset() {
@@ -158,7 +143,7 @@
                             memo: undefined,
         };
         this.resetForm("formRef");
-      },
+      }
     }
   };
 </script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/index
index dfdf41b09..460758127 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/index
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/index
@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="名字" prop="name">
@@ -155,13 +154,12 @@ export default {
   },
   methods: {
     /** 查询列表 */
-    getList() {
+    async getList() {
       try {
       this.loading = true;
-            StudentApi.getStudentPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-      });
+              const res = await StudentApi.getStudentPage(this.queryParams);
+        this.list = res.data.list;
+        this.total = res.data.total;
       } finally {
         this.loading = false;
       }
@@ -181,31 +179,25 @@ export default {
       this.$refs["formRef"].open(id);
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
-      const that = this;
-      try {
+    async handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?').then(()=>{
-          return StudentApi.deleteStudent(id);
-        }).then(() => {
-        that.getList();
-        that.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      await this.$modal.confirm('是否确认删除学生编号为"' + id + '"的数据项?')
+      try {
+       await StudentApi.deleteStudent(id);
+       await this.getList();
+       this.$modal.msgSuccess("删除成功");
       } catch {}
     },
     /** 导出按钮操作 */
-    handleExport() {
-      const that = this;
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有学生数据项?');
       try {
-          this.$modal.confirm('是否确认导出所有学生数据项?').then(() => {
-              that.exportLoading = true;
-              return StudentApi.exportStudentExcel(params);
-            }).then(response => {
-              that.$download.excel(response, '学生.xls');
-            });
+        this.exportLoading = true;
+        const res = await StudentApi.exportStudentExcel(this.queryParams);
+        this.$download.excel(res.data, '学生.xls');
       } catch {
       } finally {
-        that.exportLoading = false;
+        this.exportLoading = false;
       }
     },
               }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/CategoryForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/CategoryForm
index 4a364ba14..7fa06e8cf 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/CategoryForm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/CategoryForm
@@ -8,10 +8,10 @@
                     </el-form-item>
                     <el-form-item label="父编号" prop="parentId">
                       <TreeSelect
-                          v-model="formData.parentId"
-                          :options="categoryTree"
-                          :normalizer="normalizer"
-                          placeholder="请选择父编号"
+                        v-model="formData.parentId"
+                        :options="categoryTree"
+                        :normalizer="normalizer"
+                        placeholder="请选择父编号"
                       />
                     </el-form-item>
       </el-form>
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-  import * as CategoryApi from '@/api/infra/demo'
+  import * as CategoryApi from '@/api/infra/demo';
     import TreeSelect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
     export default {
@@ -56,71 +56,54 @@
     },
     methods: {
       /** 打开弹窗 */
-     open(id) {
+     async open(id) {
         this.dialogVisible = true;
         this.reset();
-        const that = this;
         // 修改时，设置数据
         if (id) {
           this.formLoading = true;
           try {
-            CategoryApi.getCategory(id).then(res=>{
-              that.formData = res.data;
-              that.title = "修改分类";
-            })
+            const res = await CategoryApi.getCategory(id);
+            this.formData = res.data;
+            this.title = "修改分类";
           } finally {
             this.formLoading = false;
           }
         }
         this.title = "新增分类";
-                    this.getCategoryTree();
+                await this.getCategoryTree();
       },
       /** 提交按钮 */
-      submitForm() {
-        this.formLoading = true;
+      async submitForm() {
+        // 校验主表
+        await this.$refs["formRef"].validate();
+                  this.formLoading = true;
         try {
-          const that = this;
-          let data = this.formData;
-          let validate = false;
-          // 校验主表
-          this.getRef("formRef").validate(valid => {
-            validate = valid;
-          });
-                  // 所有表单校验通过后方可提交
-          if (!validate) {
-            return;
-          }
-          // 修改的提交
+          const data = this.formData;
+                  // 修改的提交
           if (data.id) {
-                  CategoryApi.updateCategory(data).then(response => {
-              that.$modal.msgSuccess("修改成功");
-              that.dialogVisible = false;
-              that.$emit('success');
-            });
+            await CategoryApi.updateCategory(data);
+            this.$modal.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.$emit('success');
             return;
           }
           // 添加的提交
-          CategoryApi.createCategory(data).then(response => {
-            that.$modal.msgSuccess("新增成功");
-            that.dialogVisible = false;
-            that.$emit('success');
-          });
-        }finally {
+          await CategoryApi.createCategory(data);
+          this.$modal.msgSuccess("新增成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+        } finally {
           this.formLoading = false;
         }
-      },
-      getRef(refName){
-        return this.$refs[refName];
       },
                   /** 获得分类树 */
-          getCategoryTree() {
-            const that = this;
-            that.categoryTree = [];
-                  CategoryApi.getCategoryList().then(res=>{
-              const root = { id: 0, name: '顶级分类', children: [] };
-              root.children = this.handleTree(res.data, 'id', 'parentId')
-              that.categoryTree.push(root)
-            });
+         async getCategoryTree() {
+            this.categoryTree = [];
+            const res = await CategoryApi.getCategoryList();
+            const root = { id: 0, name: '顶级分类', children: [] };
+            root.children = this.handleTree(res.data, 'id', 'parentId')
+            this.categoryTree.push(root)
           },
                   /** 转换分类数据结构 */
           normalizer(node) {
@@ -141,7 +124,7 @@
                             parentId: undefined,
         };
         this.resetForm("formRef");
-      },
+      }
     }
   };
 </script>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/index
index 9ae16fafa..88da68254 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/index
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/index
@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="名字" prop="name">
@@ -31,14 +30,14 @@
     </el-row>
 
             <el-table
-          v-loading="loading"
-          :data="list"
-          :stripe="true"
-          :show-overflow-tooltip="true"
-          v-if="refreshTable"
-          row-key="id"
-          :default-expand-all="isExpandAll"
-          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        v-if="refreshTable"
+        row-key="id"
+        :default-expand-all="isExpandAll"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       >
             <el-table-column label="编号" align="center" prop="id">
         <template v-slot="scope">
@@ -104,12 +103,11 @@ export default {
   },
   methods: {
     /** 查询列表 */
-    getList() {
+    async getList() {
       try {
       this.loading = true;
-              CategoryApi.getCategoryList(this.queryParams).then(response => {
-          this.list = this.handleTree(response.data, 'id', 'parentId');
-        })
+             const res = await CategoryApi.getCategoryList(this.queryParams);
+       this.list = this.handleTree(res.data, 'id', 'parentId');
       } finally {
         this.loading = false;
       }
@@ -129,31 +127,25 @@ export default {
       this.$refs["formRef"].open(id);
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
-      const that = this;
-      try {
+    async handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除分类编号为"' + id + '"的数据项?').then(()=>{
-          return CategoryApi.deleteCategory(id);
-        }).then(() => {
-        that.getList();
-        that.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      await this.$modal.confirm('是否确认删除分类编号为"' + id + '"的数据项?')
+      try {
+       await CategoryApi.deleteCategory(id);
+       await this.getList();
+       this.$modal.msgSuccess("删除成功");
       } catch {}
     },
     /** 导出按钮操作 */
-    handleExport() {
-      const that = this;
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有分类数据项?');
       try {
-          this.$modal.confirm('是否确认导出所有分类数据项?').then(() => {
-              that.exportLoading = true;
-              return CategoryApi.exportCategoryExcel(params);
-            }).then(response => {
-              that.$download.excel(response, '分类.xls');
-            });
+        this.exportLoading = true;
+        const res = await CategoryApi.exportCategoryExcel(this.queryParams);
+        this.$download.excel(res.data, '分类.xls');
       } catch {
       } finally {
-        that.exportLoading = false;
+        this.exportLoading = false;
       }
     },
                     /** 展开/折叠操作 */