diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants.java
index 7cf23c8..94b89a2 100644
--- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants.java
+++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants.java
@@ -48,6 +48,10 @@ public interface ErrorCodeConstants {
     ErrorCode CODEGEN_MASTER_TABLE_NOT_EXISTS = new ErrorCode(1_001_004_010, "主表(id={})定义不存在，请检查");
     ErrorCode CODEGEN_SUB_COLUMN_NOT_EXISTS = new ErrorCode(1_001_004_011, "子表的字段(id={})不存在，请检查");
     ErrorCode CODEGEN_MASTER_GENERATION_FAIL_NO_SUB_TABLE = new ErrorCode(1_001_004_012, "主表生成代码失败，原因：它没有子表");
+    ErrorCode CODEGEN_MASTER_TABLE_NAME_DUPLICATE = new ErrorCode(1_001_004_013,
+            "主子表规范化类名({})重复，请调整主表或子表类名");
+    ErrorCode CODEGEN_MASTER_TABLE_FIELD_DUPLICATE = new ErrorCode(1_001_004_014,
+            "主子表属性名({})重复，请调整主表字段、子表类名或关联关系");
 
     // ========== 文件配置 1-001-006-000 ==========
     ErrorCode FILE_CONFIG_NOT_EXISTS = new ErrorCode(1_001_006_000, "文件配置不存在");
diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
index 9a1f530..8bf14ba 100644
--- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
+++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
@@ -48,6 +48,9 @@ import java.util.*;
 
 import static cn.hutool.core.map.MapUtil.getStr;
 import static cn.hutool.core.text.CharSequenceUtil.*;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.CODEGEN_MASTER_TABLE_FIELD_DUPLICATE;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.CODEGEN_MASTER_TABLE_NAME_DUPLICATE;
 
 /**
  * 代码生成的引擎，用于具体生成代码
@@ -426,16 +429,23 @@ public class CodegenEngine {
     private void generateCode(Map<String, String> result, Map<String, String> generatedSources, String vmPath,
                               String filePath, Map<String, Object> bindingMap) {
         filePath = formatFilePath(filePath, bindingMap);
-        String source = vmPath + (bindingMap.containsKey("subIndex") ? "[subIndex=" + bindingMap.get("subIndex") + "]" : "");
+        registerGeneratedSource(generatedSources, filePath, vmPath, bindingMap);
+        String content = templateEngine.getTemplate(vmPath).render(bindingMap);
+        // 格式化代码
+        content = prettyCode(content, vmPath);
+        result.put(filePath, content);
+    }
+
+    @VisibleForTesting
+    static void registerGeneratedSource(Map<String, String> generatedSources, String filePath, String vmPath,
+                                        Map<String, Object> bindingMap) {
+        String source = vmPath
+                + (bindingMap.containsKey("subIndex") ? "[subIndex=" + bindingMap.get("subIndex") + "]" : "");
         String previousSource = generatedSources.putIfAbsent(filePath, source);
         if (previousSource != null) {
             throw new IllegalStateException(String.format("生成文件路径重复：%s，来源模板：%s、%s",
                     filePath, previousSource, source));
         }
-        String content = templateEngine.getTemplate(vmPath).render(bindingMap);
-        // 格式化代码
-        content = prettyCode(content, vmPath);
-        result.put(filePath, content);
     }
 
     private void generateSubCode(CodegenTableDO table, List<CodegenTableDO> subTables,
@@ -561,6 +571,14 @@ public class CodegenEngine {
             List<String> subClassNameVars = new ArrayList<>();
             List<String> simpleClassNameUnderlineCases = new ArrayList<>();
             List<String> subSimpleClassNameStrikeCases = new ArrayList<>();
+            Set<String> masterSymbols = new HashSet<>();
+            masterSymbols.add(simpleClassName);
+            boolean mergeSubTableFields = ObjectUtils.equalsAny(table.getTemplateType(),
+                    CodegenTemplateTypeEnum.MASTER_NORMAL.getType(), CodegenTemplateTypeEnum.MASTER_INNER.getType());
+            Set<String> masterFieldSymbols = new HashSet<>();
+            if (mergeSubTableFields) {
+                columns.forEach(column -> masterFieldSymbols.add(column.getJavaField()));
+            }
             for (int i = 0; i < subTables.size(); i++) {
                 CodegenTableDO subTable = subTables.get(i);
                 List<CodegenColumnDO> subColumns = subColumnsList.get(i);
@@ -571,9 +589,18 @@ public class CodegenEngine {
                 subJoinColumnStrikeCases.add(toSymbolCase(subColumn.getJavaField(), '-')); // 将 DictType 转换成 dict-type
                 // className 相关
                 String subSimpleClassName = removePrefix(subTable.getClassName(), upperFirst(subTable.getModuleName()));
+                if (!masterSymbols.add(subSimpleClassName)) {
+                    throw exception(CODEGEN_MASTER_TABLE_NAME_DUPLICATE, subSimpleClassName);
+                }
+                String subClassNameVar = lowerFirst(subSimpleClassName);
+                String subFieldName = subClassNameVar
+                        + (Boolean.TRUE.equals(subTable.getSubJoinMany()) ? "s" : "");
+                if (mergeSubTableFields && !masterFieldSymbols.add(subFieldName)) {
+                    throw exception(CODEGEN_MASTER_TABLE_FIELD_DUPLICATE, subFieldName);
+                }
                 subSimpleClassNames.add(subSimpleClassName);
                 simpleClassNameUnderlineCases.add(toUnderlineCase(subSimpleClassName)); // 将 DictType 转换成 dict_type
-                subClassNameVars.add(lowerFirst(subSimpleClassName)); // 将 DictType 转换成 dictType，用于变量
+                subClassNameVars.add(subClassNameVar); // 将 DictType 转换成 dictType，用于变量
                 subSimpleClassNameStrikeCases.add(toSymbolCase(subSimpleClassName, '-')); // 将 DictType 转换成 dict-type
             }
             bindingMap.put("subPrimaryColumns", subPrimaryColumns);
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/api/api.ts.vm
index 209b540..9285223 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/api/api.ts.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/api/api.ts.vm
@@ -4,7 +4,7 @@ import type { PageParam, PageResult } from '@/http/types'
 import { http } from '@/http/http'
 
 #set ($primaryJavaType = $primaryColumn.javaType.toLowerCase())
-#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
+#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "float" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
 #set ($primaryTsType = "number")
 #else
 #set ($primaryTsType = "string")
@@ -20,7 +20,7 @@ export interface ${subSimpleClassName} {
 #if ($column.primaryKey || $column.createOperation || $column.updateOperation || $column.listOperationResult)
 #set ($javaType = $column.javaType.toLowerCase())
 #set ($optional = $column.nullable || $column.primaryKey || ($table.templateType != 11 && $column.id == $subJoinColumn.id))
-#if(${javaType} == "long" || ${javaType} == "integer" || ${javaType} == "short" || ${javaType} == "double" || ${javaType} == "bigdecimal" || ${javaType} == "byte")
+#if(${javaType} == "long" || ${javaType} == "integer" || ${javaType} == "short" || ${javaType} == "float" || ${javaType} == "double" || ${javaType} == "bigdecimal" || ${javaType} == "byte")
   ${column.javaField}#if($optional)?#end: number
 #elseif(${javaType} == "date" || ${javaType} == "localdate" || ${javaType} == "localdatetime")
   ${column.javaField}#if($optional)?#end: number
@@ -40,7 +40,7 @@ export interface ${simpleClassName} {
 #if ($column.primaryKey || $column.createOperation || $column.updateOperation || $column.listOperationResult)
 #set ($javaType = $column.javaType.toLowerCase())
 #set ($optional = $column.nullable || $column.primaryKey)
-#if(${javaType} == "long" || ${javaType} == "integer" || ${javaType} == "short" || ${javaType} == "double" || ${javaType} == "bigdecimal" || ${javaType} == "byte")
+#if(${javaType} == "long" || ${javaType} == "integer" || ${javaType} == "short" || ${javaType} == "float" || ${javaType} == "double" || ${javaType} == "bigdecimal" || ${javaType} == "byte")
   ${column.javaField}#if($optional)?#end: number
 #elseif(${javaType} == "date" || ${javaType} == "localdate" || ${javaType} == "localdatetime")
   ${column.javaField}#if($optional)?#end: number
@@ -101,13 +101,13 @@ export function delete${simpleClassName}(id: ${primaryTsType}) {
 #set ($subPrimaryColumn = $subPrimaryColumns.get($index))
 #set ($subJoinColumn = $subJoinColumns.get($index))
 #set ($subPrimaryJavaType = $subPrimaryColumn.javaType.toLowerCase())
-#if(${subPrimaryJavaType} == "long" || ${subPrimaryJavaType} == "integer" || ${subPrimaryJavaType} == "short" || ${subPrimaryJavaType} == "double" || ${subPrimaryJavaType} == "bigdecimal" || ${subPrimaryJavaType} == "byte")
+#if(${subPrimaryJavaType} == "long" || ${subPrimaryJavaType} == "integer" || ${subPrimaryJavaType} == "short" || ${subPrimaryJavaType} == "float" || ${subPrimaryJavaType} == "double" || ${subPrimaryJavaType} == "bigdecimal" || ${subPrimaryJavaType} == "byte")
 #set ($subPrimaryTsType = "number")
 #else
 #set ($subPrimaryTsType = "string")
 #end
 #set ($subJoinJavaType = $subJoinColumn.javaType.toLowerCase())
-#if(${subJoinJavaType} == "long" || ${subJoinJavaType} == "integer" || ${subJoinJavaType} == "short" || ${subJoinJavaType} == "double" || ${subJoinJavaType} == "bigdecimal" || ${subJoinJavaType} == "byte")
+#if(${subJoinJavaType} == "long" || ${subJoinJavaType} == "integer" || ${subJoinJavaType} == "short" || ${subJoinJavaType} == "float" || ${subJoinJavaType} == "double" || ${subJoinJavaType} == "bigdecimal" || ${subJoinJavaType} == "byte")
 #set ($subJoinTsType = "number")
 #else
 #set ($subJoinTsType = "string")
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/components/search-form.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/components/search-form.vue.vm
index 0aa06fd..483af6b 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/components/search-form.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/components/search-form.vue.vm
@@ -145,7 +145,7 @@ const formData = reactive({
       #else
   ${column.javaField}: undefined as number | undefined,
       #end
-    #elseif(${javaType} == "long" || ${javaType} == "integer" || ${javaType} == "short" || ${javaType} == "double" || ${javaType} == "bigdecimal" || ${javaType} == "byte")
+    #elseif(${javaType} == "long" || ${javaType} == "integer" || ${javaType} == "short" || ${javaType} == "float" || ${javaType} == "double" || ${javaType} == "bigdecimal" || ${javaType} == "byte")
   ${column.javaField}: undefined as number | undefined,
     #elseif(${javaType} == "boolean")
   ${column.javaField}: undefined as boolean | undefined,
@@ -174,7 +174,7 @@ const placeholder = computed(() => {
     conditions.push(`${comment}:#[[${]]#getDictLabel(DICT_TYPE.${dictType.toUpperCase()}, formData.${javaField})#[[}]]#`)
   }
     #else
-      #if(${javaType} == "long" || ${javaType} == "integer" || ${javaType} == "short" || ${javaType} == "double" || ${javaType} == "bigdecimal" || ${javaType} == "byte" || ${javaType} == "boolean")
+      #if(${javaType} == "long" || ${javaType} == "integer" || ${javaType} == "short" || ${javaType} == "float" || ${javaType} == "double" || ${javaType} == "bigdecimal" || ${javaType} == "byte" || ${javaType} == "boolean")
   if (formData.${javaField} !== undefined) {
     conditions.push(`${comment}:#[[${]]#formData.${javaField}#[[}]]#`)
   }
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail/index.vue.vm
index c861eea..817ab5e 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail/index.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail/index.vue.vm
@@ -50,7 +50,7 @@
 
 <script lang="ts" setup>
 #set ($primaryJavaType = $primaryColumn.javaType.toLowerCase())
-#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
+#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "float" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
 #set ($primaryTsType = "number")
 #else
 #set ($primaryTsType = "string")
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail_erp.vue.vm
index 9614633..925763f 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail_erp.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail_erp.vue.vm
@@ -101,7 +101,7 @@
 
 <script lang="ts" setup>
 #set ($primaryJavaType = $primaryColumn.javaType.toLowerCase())
-#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
+#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "float" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
 #set ($primaryTsType = "number")
 #else
 #set ($primaryTsType = "string")
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail_master.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail_master.vue.vm
index 1499a8d..88d1767 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail_master.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail_master.vue.vm
@@ -94,7 +94,7 @@
 
 <script lang="ts" setup>
 #set ($primaryJavaType = $primaryColumn.javaType.toLowerCase())
-#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
+#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "float" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
 #set ($primaryTsType = "number")
 #else
 #set ($primaryTsType = "string")
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form/index.vue.vm
index 84798e8..b98423d 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form/index.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form/index.vue.vm
@@ -42,10 +42,14 @@
             label="${comment}"
             label-width="180rpx"
             prop="${javaField}"
+#if ($javaType == "Boolean")
+            :columns="getBoolDictOptions(DICT_TYPE.${dictType.toUpperCase()})"
+#else
             :dict-type="DICT_TYPE.${dictType.toUpperCase()}"
 #if ($javaType == "String")
             dict-kind="str"
 #end
+#end
             placeholder="请选择${comment}"
           />
 ## 单选（字典）→ radio-group，适合选项较少
@@ -62,14 +66,14 @@
             </wd-radio-group>
           </wd-form-item>
 ## 数字类型（无字典）
-#elseif (${javaType.toLowerCase()} == "long" || ${javaType.toLowerCase()} == "integer" || ${javaType.toLowerCase()} == "short" || ${javaType.toLowerCase()} == "double" || ${javaType.toLowerCase()} == "bigdecimal" || ${javaType.toLowerCase()} == "byte")
+#elseif (${javaType.toLowerCase()} == "long" || ${javaType.toLowerCase()} == "integer" || ${javaType.toLowerCase()} == "short" || ${javaType.toLowerCase()} == "float" || ${javaType.toLowerCase()} == "double" || ${javaType.toLowerCase()} == "bigdecimal" || ${javaType.toLowerCase()} == "byte")
           <wd-form-item title="${comment}" title-width="180rpx" prop="${javaField}">
             <wd-input-number
               v-model="formData.${javaField}"
 #if ($column.nullable)
               allow-null
 #end
-#if (${javaType.toLowerCase()} == "double" || ${javaType.toLowerCase()} == "bigdecimal")
+#if (${javaType.toLowerCase()} == "float" || ${javaType.toLowerCase()} == "double" || ${javaType.toLowerCase()} == "bigdecimal")
               :precision="2"
               input-type="number"
 #end
@@ -104,20 +108,20 @@
             v-model:visible="${javaField}Visible"
             :model-value="formData.${javaField} || Date.now()"
             type="${pickerType}"
-#if ($pickerType == "datetime")
             @update:model-value="value => formData.${javaField} = value"
-#else
-            @update:model-value="value => formData.${javaField} = value"
-#end
           />
 ## 文本域
-#elseif ($column.htmlType == "textarea")
+#elseif ($column.htmlType == "textarea" || $column.htmlType == "editor")
           <wd-form-item title="${comment}" title-width="180rpx" prop="${javaField}">
             <wd-textarea
               v-model="formData.${javaField}"
               clearable
               placeholder="请输入${comment}"
+#if ($column.htmlType == "editor")
+              :maxlength="2000"
+#else
               :maxlength="200"
+#end
               show-word-limit
             />
           </wd-form-item>
@@ -129,7 +133,7 @@
 ## 文件上传 → yd-upload-file
 #elseif ($column.htmlType == "fileUpload")
           <wd-form-item title="${comment}" title-width="180rpx" prop="${javaField}">
-            <yd-upload-file v-model="formData.${javaField}" directory="${table.moduleName}/${table.businessName}" />
+            <yd-upload-file v-model="formData.${javaField}" :limit="1" directory="${table.moduleName}/${table.businessName}" />
           </wd-form-item>
 ## 默认：文本输入
 #else
@@ -202,10 +206,14 @@
             v-model="item.${column.javaField}"
             label="${column.columnComment}"
             label-width="180rpx"
+#if ($column.javaType == "Boolean")
+            :columns="getBoolDictOptions(DICT_TYPE.${column.dictType.toUpperCase()})"
+#else
             :dict-type="DICT_TYPE.${column.dictType.toUpperCase()}"
 #if ($column.javaType == "String")
             dict-kind="str"
 #end
+#end
             placeholder="请选择${column.columnComment}"
           />
 #elseif ($column.htmlType == "radio" && $column.dictType && "" != $column.dictType)
@@ -224,14 +232,14 @@
           <wd-form-item title="${column.columnComment}" title-width="180rpx" center>
             <wd-switch v-model="item.${column.javaField}" />
           </wd-form-item>
-#elseif ($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte")
+#elseif ($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "float" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte")
           <wd-form-item title="${column.columnComment}" title-width="180rpx">
             <wd-input-number
               v-model="item.${column.javaField}"
 #if($column.nullable)
               allow-null
 #end
-#if ($javaType == "double" || $javaType == "bigdecimal")
+#if ($javaType == "float" || $javaType == "double" || $javaType == "bigdecimal")
               :precision="2"
               input-type="number"
 #end
@@ -259,15 +267,20 @@
             v-model:visible="subDateVisible[`${subClassNameVar}s.#[[${]]#index#[[}]]#.${column.javaField}`]"
             :model-value="item.${column.javaField} || Date.now()"
             type="${subPickerType}"
-#if ($javaType == "localdatetime")
             @update:model-value="value => item.${column.javaField} = value"
-#else
-            @update:model-value="value => item.${column.javaField} = value"
-#end
           />
-#elseif ($column.htmlType == "textarea")
+#elseif ($column.htmlType == "textarea" || $column.htmlType == "editor")
           <wd-form-item title="${column.columnComment}" title-width="180rpx">
-            <wd-textarea v-model="item.${column.javaField}" clearable placeholder="请输入${column.columnComment}" />
+            <wd-textarea
+              v-model="item.${column.javaField}"
+              clearable
+              placeholder="请输入${column.columnComment}"
+#if ($column.htmlType == "editor")
+              :maxlength="2000"
+#else
+              :maxlength="200"
+#end
+            />
           </wd-form-item>
 #elseif ($column.htmlType == "imageUpload")
           <wd-form-item title="${column.columnComment}" title-width="180rpx">
@@ -275,7 +288,7 @@
           </wd-form-item>
 #elseif ($column.htmlType == "fileUpload")
           <wd-form-item title="${column.columnComment}" title-width="180rpx">
-            <yd-upload-file v-model="item.${column.javaField}" directory="${table.moduleName}/${table.businessName}" />
+            <yd-upload-file v-model="item.${column.javaField}" :limit="1" directory="${table.moduleName}/${table.businessName}" />
           </wd-form-item>
 #else
           <wd-form-item title="${column.columnComment}" title-width="180rpx">
@@ -306,10 +319,14 @@
             v-model="${subClassNameVar}.${column.javaField}"
             label="${column.columnComment}"
             label-width="180rpx"
+#if ($column.javaType == "Boolean")
+            :columns="getBoolDictOptions(DICT_TYPE.${column.dictType.toUpperCase()})"
+#else
             :dict-type="DICT_TYPE.${column.dictType.toUpperCase()}"
 #if ($column.javaType == "String")
             dict-kind="str"
 #end
+#end
             placeholder="请选择${column.columnComment}"
           />
 #elseif ($column.htmlType == "radio" && $column.dictType && "" != $column.dictType)
@@ -328,14 +345,14 @@
           <wd-form-item title="${column.columnComment}" title-width="180rpx" center>
             <wd-switch v-model="${subClassNameVar}.${column.javaField}" />
           </wd-form-item>
-#elseif ($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte")
+#elseif ($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "float" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte")
           <wd-form-item title="${column.columnComment}" title-width="180rpx">
             <wd-input-number
               v-model="${subClassNameVar}.${column.javaField}"
 #if($column.nullable)
               allow-null
 #end
-#if ($javaType == "double" || $javaType == "bigdecimal")
+#if ($javaType == "float" || $javaType == "double" || $javaType == "bigdecimal")
               :precision="2"
               input-type="number"
 #end
@@ -363,15 +380,20 @@
             v-model:visible="subDateVisible['${subClassNameVar}.${column.javaField}']"
             :model-value="${subClassNameVar}.${column.javaField} || Date.now()"
             type="${subPickerType}"
-#if ($javaType == "localdatetime")
-            @update:model-value="value => ${subClassNameVar}.${column.javaField} = value"
-#else
             @update:model-value="value => ${subClassNameVar}.${column.javaField} = value"
-#end
           />
-#elseif ($column.htmlType == "textarea")
+#elseif ($column.htmlType == "textarea" || $column.htmlType == "editor")
           <wd-form-item title="${column.columnComment}" title-width="180rpx">
-            <wd-textarea v-model="${subClassNameVar}.${column.javaField}" clearable placeholder="请输入${column.columnComment}" />
+            <wd-textarea
+              v-model="${subClassNameVar}.${column.javaField}"
+              clearable
+              placeholder="请输入${column.columnComment}"
+#if ($column.htmlType == "editor")
+              :maxlength="2000"
+#else
+              :maxlength="200"
+#end
+            />
           </wd-form-item>
 #elseif ($column.htmlType == "imageUpload")
           <wd-form-item title="${column.columnComment}" title-width="180rpx">
@@ -379,7 +401,7 @@
           </wd-form-item>
 #elseif ($column.htmlType == "fileUpload")
           <wd-form-item title="${column.columnComment}" title-width="180rpx">
-            <yd-upload-file v-model="${subClassNameVar}.${column.javaField}" directory="${table.moduleName}/${table.businessName}" />
+            <yd-upload-file v-model="${subClassNameVar}.${column.javaField}" :limit="1" directory="${table.moduleName}/${table.businessName}" />
           </wd-form-item>
 #else
           <wd-form-item title="${column.columnComment}" title-width="180rpx">
@@ -412,7 +434,7 @@
 <script lang="ts" setup>
 import type { FormInstance } from '@wot-ui/ui/components/wd-form/types'
 #set ($primaryJavaType = $primaryColumn.javaType.toLowerCase())
-#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
+#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "float" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
 #set ($primaryTsType = "number")
 #else
 #set ($primaryTsType = "string")
@@ -434,7 +456,7 @@ import type { FormInstance } from '@wot-ui/ui/components/wd-form/types'
 #set ($hasGetIntDictOptions = 1)
 #elseif ($column.htmlType == "radio" && $column.javaType == "String")
 #set ($hasGetStrDictOptions = 1)
-#elseif ($column.htmlType == "radio" && $column.javaType == "Boolean")
+#elseif (($column.htmlType == "select" || $column.htmlType == "radio") && $column.javaType == "Boolean")
 #set ($hasGetBoolDictOptions = 1)
 #elseif ($column.htmlType == "radio")
 #set ($hasGetDictOptions = 1)
@@ -460,7 +482,7 @@ import type { FormInstance } from '@wot-ui/ui/components/wd-form/types'
 #set ($hasGetIntDictOptions = 1)
 #elseif ($column.htmlType == "radio" && $column.javaType == "String")
 #set ($hasGetStrDictOptions = 1)
-#elseif ($column.htmlType == "radio" && $column.javaType == "Boolean")
+#elseif (($column.htmlType == "select" || $column.htmlType == "radio") && $column.javaType == "Boolean")
 #set ($hasGetBoolDictOptions = 1)
 #elseif ($column.htmlType == "radio")
 #set ($hasGetDictOptions = 1)
@@ -567,7 +589,7 @@ definePage({
 const toast = useToast()
 const getTitle = computed(() => props.id ? '编辑${table.classComment}' : '新增${table.classComment}')
 const formLoading = ref(false) // 表单提交状态
-const formData = ref<${simpleClassName}>({
+const formData = ref<Partial<${simpleClassName}>>({
 #foreach($column in $columns)
 #if (($column.createOperation || $column.updateOperation) || $column.primaryKey)
 #set ($javaType = $column.javaType.toLowerCase())
@@ -577,7 +599,9 @@ const formData = ref<${simpleClassName}>({
   ${column.javaField}: undefined,
 #elseif($table.templateType == 2 && $column.id == $treeParentColumn.id)
   ${column.javaField}: props.${column.javaField} ?? 0,
-#elseif(${javaType} == "long" || ${javaType} == "integer" || ${javaType} == "short" || ${javaType} == "double" || ${javaType} == "bigdecimal" || ${javaType} == "byte")
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $column.dictType && "" != $column.dictType)
+  ${column.javaField}: undefined,
+#elseif(${javaType} == "long" || ${javaType} == "integer" || ${javaType} == "short" || ${javaType} == "float" || ${javaType} == "double" || ${javaType} == "bigdecimal" || ${javaType} == "byte")
 #if($column.nullable)
   ${column.javaField}: undefined,
 #else
@@ -586,7 +610,7 @@ const formData = ref<${simpleClassName}>({
 #elseif(${javaType} == "boolean")
   ${column.javaField}: false,
 #elseif(${javaType} == "date" || ${javaType} == "localdate" || ${javaType} == "localdatetime")
-  ${column.javaField}:#if($column.nullable || $column.primaryKey || $javaFieldLower == "createtime" || $javaFieldLower == "updatetime") undefined#else 0#end,
+  ${column.javaField}: undefined,
 #else
   ${column.javaField}: '',
 #end
@@ -601,9 +625,9 @@ const formData = ref<${simpleClassName}>({
 #set ($subColumns = $subColumnsList.get($index))
 #set ($subJoinColumn = $subJoinColumns.get($index))
 #if ($subTable.subJoinMany)
-const ${subClassNameVar}s = ref<${subSimpleClassName}[]>([]) // ${subTable.classComment}数据
+const ${subClassNameVar}s = ref<Partial<${subSimpleClassName}>[]>([]) // ${subTable.classComment}数据
 #else
-const ${subClassNameVar} = ref<${subSimpleClassName} | null>(null) // ${subTable.classComment}数据
+const ${subClassNameVar} = ref<Partial<${subSimpleClassName}> | null>(null) // ${subTable.classComment}数据
 #end
 #end
 #end
@@ -646,7 +670,11 @@ function add${subClassNameVar.substring(0,1).toUpperCase()}${subClassNameVar.sub
 #foreach ($column in $subColumns)
 #if (($column.createOperation || $column.updateOperation) && !$column.primaryKey && $column.id != $subJoinColumn.id)
 #set ($javaType = $column.javaType.toLowerCase())
-    ${column.javaField}:#if($column.nullable) undefined#elseif($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte" || $javaType == "date" || $javaType == "localdate" || $javaType == "localdatetime") 0#elseif($javaType == "boolean") false#else ''#end,
+#if((($column.htmlType == "select" || $column.htmlType == "radio") && $column.dictType && "" != $column.dictType) || $javaType == "date" || $javaType == "localdate" || $javaType == "localdatetime")
+    ${column.javaField}: undefined,
+#else
+    ${column.javaField}:#if($column.nullable) undefined#elseif($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "float" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte") 0#elseif($javaType == "boolean") false#else ''#end,
+#end
 #end
 #end
   })
@@ -664,7 +692,11 @@ function add${subClassNameVar.substring(0,1).toUpperCase()}${subClassNameVar.sub
 #foreach ($column in $subColumns)
 #if (($column.createOperation || $column.updateOperation) && !$column.primaryKey && $column.id != $subJoinColumn.id)
 #set ($javaType = $column.javaType.toLowerCase())
-    ${column.javaField}:#if($column.nullable) undefined#elseif($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte" || $javaType == "date" || $javaType == "localdate" || $javaType == "localdatetime") 0#elseif($javaType == "boolean") false#else ''#end,
+#if((($column.htmlType == "select" || $column.htmlType == "radio") && $column.dictType && "" != $column.dictType) || $javaType == "date" || $javaType == "localdate" || $javaType == "localdatetime")
+    ${column.javaField}: undefined,
+#else
+    ${column.javaField}:#if($column.nullable) undefined#elseif($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "float" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte") 0#elseif($javaType == "boolean") false#else ''#end,
+#end
 #end
 #end
   }
@@ -771,16 +803,16 @@ async function handleSubmit() {
   formLoading.value = true
   try {
 #if ($table.templateType == 10 || $table.templateType == 12)
-    const data: ${simpleClassName} = {
+    const data = {
       ...formData.value,
 #foreach ($subTable in $subTables)
 #set ($index = $foreach.count - 1)
 #set ($subClassNameVar = $subClassNameVars.get($index))
       ${subClassNameVar}#if($subTable.subJoinMany)s#end: ${subClassNameVar}#if($subTable.subJoinMany)s#end.value,
 #end
-    }
+    } as ${simpleClassName}
 #else
-    const data = formData.value
+    const data = formData.value as ${simpleClassName}
 #end
     if (props.id) {
       await update${simpleClassName}(data)
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form_sub_erp.vue.vm
index 46560d5..5c33246 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form_sub_erp.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form_sub_erp.vue.vm
@@ -4,24 +4,28 @@
 #set ($subPrimaryColumn = $subPrimaryColumns.get($subIndex))
 #set ($subJoinColumn = $subJoinColumns.get($subIndex))
 #set ($subPrimaryJavaType = $subPrimaryColumn.javaType.toLowerCase())
-#if(${subPrimaryJavaType} == "long" || ${subPrimaryJavaType} == "integer" || ${subPrimaryJavaType} == "short" || ${subPrimaryJavaType} == "double" || ${subPrimaryJavaType} == "bigdecimal" || ${subPrimaryJavaType} == "byte")
+#if(${subPrimaryJavaType} == "long" || ${subPrimaryJavaType} == "integer" || ${subPrimaryJavaType} == "short" || ${subPrimaryJavaType} == "float" || ${subPrimaryJavaType} == "double" || ${subPrimaryJavaType} == "bigdecimal" || ${subPrimaryJavaType} == "byte")
 #set ($subPrimaryTsType = "number")
 #else
 #set ($subPrimaryTsType = "string")
 #end
 #set ($subJoinJavaType = $subJoinColumn.javaType.toLowerCase())
-#if(${subJoinJavaType} == "long" || ${subJoinJavaType} == "integer" || ${subJoinJavaType} == "short" || ${subJoinJavaType} == "double" || ${subJoinJavaType} == "bigdecimal" || ${subJoinJavaType} == "byte")
+#if(${subJoinJavaType} == "long" || ${subJoinJavaType} == "integer" || ${subJoinJavaType} == "short" || ${subJoinJavaType} == "float" || ${subJoinJavaType} == "double" || ${subJoinJavaType} == "bigdecimal" || ${subJoinJavaType} == "byte")
 #set ($subJoinTsType = "number")
 #else
 #set ($subJoinTsType = "string")
 #end
 #set ($hasDict = 0)
+#set ($hasBoolDict = 0)
 #set ($hasDate = 0)
 #set ($hasDateTime = 0)
 #foreach ($column in $subColumns)
 #if (($column.createOperation || $column.updateOperation) && !$column.primaryKey && $column.id != $subJoinColumn.id)
 #if (($column.htmlType == "select" || $column.htmlType == "radio") && $column.dictType && "" != $column.dictType)
 #set ($hasDict = 1)
+#if ($column.javaType == "Boolean")
+#set ($hasBoolDict = 1)
+#end
 #end
 #if (${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdate")
 #set ($hasDate = 1)
@@ -48,10 +52,14 @@
           label="${column.columnComment}"
           label-width="180rpx"
           prop="${column.javaField}"
+#if ($column.javaType == "Boolean")
+          :columns="getBoolDictOptions(DICT_TYPE.${column.dictType.toUpperCase()})"
+#else
           :dict-type="DICT_TYPE.${column.dictType.toUpperCase()}"
 #if ($column.javaType == "String")
           dict-kind="str"
 #end
+#end
           placeholder="请选择${column.columnComment}"
         />
 #elseif ($javaType == "date" || $javaType == "localdate" || $javaType == "localdatetime")
@@ -76,34 +84,39 @@
           v-model:visible="${column.javaField}Visible"
           :model-value="formData.${column.javaField} || Date.now()"
           type="${pickerType}"
-#if ($javaType == "localdatetime")
           @update:model-value="value => formData.${column.javaField} = value"
-#else
-          @update:model-value="value => formData.${column.javaField} = value"
-#end
         />
 #else
         <wd-form-item title="${column.columnComment}" title-width="180rpx" prop="${column.javaField}">
 #if ($javaType == "boolean")
           <wd-switch v-model="formData.${column.javaField}" />
-#elseif ($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte")
+#elseif ($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "float" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte")
           <wd-input-number
             v-model="formData.${column.javaField}"
 #if($column.nullable)
             allow-null
 #end
-#if ($javaType == "double" || $javaType == "bigdecimal")
+#if ($javaType == "float" || $javaType == "double" || $javaType == "bigdecimal")
             :precision="2"
             input-type="number"
 #end
             :min="0"
           />
-#elseif ($column.htmlType == "textarea")
-          <wd-textarea v-model="formData.${column.javaField}" clearable placeholder="请输入${column.columnComment}" />
+#elseif ($column.htmlType == "textarea" || $column.htmlType == "editor")
+          <wd-textarea
+            v-model="formData.${column.javaField}"
+            clearable
+            placeholder="请输入${column.columnComment}"
+#if ($column.htmlType == "editor")
+            :maxlength="2000"
+#else
+            :maxlength="200"
+#end
+          />
 #elseif ($column.htmlType == "imageUpload")
           <yd-upload-img v-model="formData.${column.javaField}" directory="${table.moduleName}/${table.businessName}" />
 #elseif ($column.htmlType == "fileUpload")
-          <yd-upload-file v-model="formData.${column.javaField}" directory="${table.moduleName}/${table.businessName}" />
+          <yd-upload-file v-model="formData.${column.javaField}" :limit="1" directory="${table.moduleName}/${table.businessName}" />
 #else
           <wd-input v-model="formData.${column.javaField}" clearable placeholder="请输入${column.columnComment}" />
 #end
@@ -130,6 +143,9 @@ import { computed, onMounted, ref } from 'vue'
 import { useToast } from '@wot-ui/ui/components/wd-toast'
 import { create${subSimpleClassName}, get${subSimpleClassName}, update${subSimpleClassName} } from '@/api/${table.moduleName}/${table.businessName}'
 import { delay, navigateBackPlus } from '@/utils'
+#if ($hasBoolDict == 1)
+import { getBoolDictOptions } from '@/hooks/useDict'
+#end
 #if ($hasDict == 1)
 import { DICT_TYPE } from '@/utils/constants'
 #end
@@ -159,7 +175,7 @@ definePage({
 const toast = useToast()
 const getTitle = computed(() => props.id ? '编辑${subTable.classComment}' : '新增${subTable.classComment}')
 const formLoading = ref(false) // 表单提交状态
-const formData = ref<${subSimpleClassName}>({
+const formData = ref<Partial<${subSimpleClassName}>>({
 #foreach ($column in $subColumns)
 #if ($column.primaryKey)
   ${column.javaField}: undefined,
@@ -167,7 +183,11 @@ const formData = ref<${subSimpleClassName}>({
   ${column.javaField}: props.${column.javaField},
 #elseif ($column.createOperation || $column.updateOperation)
 #set ($javaType = $column.javaType.toLowerCase())
-  ${column.javaField}:#if($column.nullable) undefined#elseif($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte" || $javaType == "date" || $javaType == "localdate" || $javaType == "localdatetime") 0#elseif($javaType == "boolean") false#else ''#end,
+#if((($column.htmlType == "select" || $column.htmlType == "radio") && $column.dictType && "" != $column.dictType) || $javaType == "date" || $javaType == "localdate" || $javaType == "localdatetime")
+  ${column.javaField}: undefined,
+#else
+  ${column.javaField}:#if($column.nullable) undefined#elseif($javaType == "long" || $javaType == "integer" || $javaType == "short" || $javaType == "float" || $javaType == "double" || $javaType == "bigdecimal" || $javaType == "byte") 0#elseif($javaType == "boolean") false#else ''#end,
+#end
 #end
 #end
 }) // 表单数据
@@ -206,7 +226,10 @@ async function handleSubmit() {
   }
   formLoading.value = true
   try {
-    const data = { ...formData.value, ${subJoinColumn.javaField}: props.${subJoinColumn.javaField} ?? formData.value.${subJoinColumn.javaField} }
+    const data = {
+      ...formData.value,
+      ${subJoinColumn.javaField}: props.${subJoinColumn.javaField} ?? formData.value.${subJoinColumn.javaField},
+    } as ${subSimpleClassName}
     if (props.id) {
       await update${subSimpleClassName}(data)
       toast.success('修改成功')
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/index_tree.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/index_tree.vue.vm
index 4686fd7..11c8be5 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/index_tree.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/index_tree.vue.vm
@@ -61,7 +61,7 @@
 
 <script lang="ts" setup>
 #set ($primaryJavaType = $primaryColumn.javaType.toLowerCase())
-#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
+#if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "float" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
 #set ($primaryTsType = "number")
 #else
 #set ($primaryTsType = "string")
diff --git a/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineUniappTest.java b/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineUniappTest.java
index 583a4f6..fbb0d60 100644
--- a/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineUniappTest.java
+++ b/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineUniappTest.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.infra.service.codegen.inner;
 
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 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;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.DbType;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -83,6 +85,8 @@ public class CodegenEngineUniappTest extends CodegenEngineAbstractTest {
                 .setFrontType(CodegenFrontTypeEnum.VUE3_ADMIN_UNIAPP_WOT.getType())
                 .setTemplateType(CodegenTemplateTypeEnum.ONE.getType());
         List<CodegenColumnDO> columns = getColumnList("student");
+        columns.stream().filter(column -> "memo".equals(column.getJavaField())).findFirst().orElseThrow()
+                .setJavaType("Float").setHtmlType("input");
 
         // 调用
         Map<String, String> result = codegenEngine.execute(DbType.MYSQL, table, columns, null, null);
@@ -90,7 +94,11 @@ public class CodegenEngineUniappTest extends CodegenEngineAbstractTest {
         String api = result.get("yudao-ui-admin-uniapp/src/api/infra/demo/index.ts");
         assertTrue(api.contains("birthday: number"));
         assertTrue(api.contains("createTime?: number"));
+        assertTrue(api.contains("memo: number"));
         assertFalse(api.contains("createTime?: Date"));
+        String form = result.get("yudao-ui-admin-uniapp/src/pages-infra/demo/form/index.vue");
+        assertTrue(form.contains("v-model=\"formData.memo\""));
+        assertTrue(form.contains(":precision=\"2\""));
         String detail = result.get("yudao-ui-admin-uniapp/src/pages-infra/demo/detail/index.vue");
         assertTrue(detail.contains("type=\"danger\""));
         assertFalse(detail.contains("type=\"error\""));
@@ -150,7 +158,7 @@ public class CodegenEngineUniappTest extends CodegenEngineAbstractTest {
     }
 
     @Test
-    public void testExecute_duplicateSubPath() {
+    public void testExecute_duplicateErpSymbol() {
         // 准备主表
         CodegenTableDO table = getTable("student")
                 .setFrontType(CodegenFrontTypeEnum.VUE3_ADMIN_UNIAPP_WOT.getType())
@@ -169,13 +177,93 @@ public class CodegenEngineUniappTest extends CodegenEngineAbstractTest {
         List<CodegenColumnDO> erpItemColumns = getColumnList("contact");
 
         // 调用
-        IllegalStateException exception = assertThrows(IllegalStateException.class,
+        ServiceException exception = assertThrows(ServiceException.class,
                 () -> codegenEngine.execute(DbType.MYSQL, table, columns,
                         Arrays.asList(crmItemTable, erpItemTable), Arrays.asList(crmItemColumns, erpItemColumns)));
         // 断言
-        assertTrue(exception.getMessage().contains("生成文件路径重复"));
-        assertTrue(exception.getMessage().contains("subIndex=0"));
-        assertTrue(exception.getMessage().contains("subIndex=1"));
+        assertTrue(exception.getMessage().contains("主子表规范化类名(OrderItem)重复"));
+    }
+
+    @Test
+    public void testExecute_duplicateMasterSymbol() {
+        // 准备主表
+        CodegenTableDO table = getTable("student")
+                .setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
+                .setTemplateType(CodegenTemplateTypeEnum.MASTER_NORMAL.getType());
+        List<CodegenColumnDO> columns = getColumnList("student");
+        // 准备两个规范化名称相同的子表
+        CodegenTableDO crmItemTable = getTable("contact").setModuleName("crm").setClassName("CrmOrderItem")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType()).setSubJoinColumnId(100L).setSubJoinMany(true);
+        CodegenTableDO erpItemTable = getTable("contact").setModuleName("erp").setClassName("ErpOrderItem")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType()).setSubJoinColumnId(100L).setSubJoinMany(true);
+        List<CodegenColumnDO> crmItemColumns = getColumnList("contact");
+        List<CodegenColumnDO> erpItemColumns = getColumnList("contact");
+
+        // 调用并断言
+        ServiceException exception = assertThrows(ServiceException.class,
+                () -> codegenEngine.execute(DbType.MYSQL, table, columns,
+                        Arrays.asList(crmItemTable, erpItemTable), Arrays.asList(crmItemColumns, erpItemColumns)));
+        assertTrue(exception.getMessage().contains("主子表规范化类名(OrderItem)重复"));
+    }
+
+    @Test
+    public void testExecute_duplicateMasterFieldNormal() {
+        testExecute_duplicateMasterField(CodegenTemplateTypeEnum.MASTER_NORMAL);
+    }
+
+    @Test
+    public void testExecute_duplicateMasterFieldInner() {
+        testExecute_duplicateMasterField(CodegenTemplateTypeEnum.MASTER_INNER);
+    }
+
+    @Test
+    public void testExecute_duplicateMasterFieldWithMainNormal() {
+        testExecute_duplicateMasterFieldWithMain(CodegenTemplateTypeEnum.MASTER_NORMAL);
+    }
+
+    @Test
+    public void testExecute_duplicateMasterFieldWithMainInner() {
+        testExecute_duplicateMasterFieldWithMain(CodegenTemplateTypeEnum.MASTER_INNER);
+    }
+
+    @Test
+    public void testExecute_duplicateMasterFieldErp() {
+        // 准备主表
+        CodegenTableDO table = getTable("student")
+                .setFrontType(CodegenFrontTypeEnum.VUE3_ADMIN_UNIAPP_WOT.getType())
+                .setTemplateType(CodegenTemplateTypeEnum.MASTER_ERP.getType());
+        List<CodegenColumnDO> columns = getColumnList("student");
+        // 准备属性名同为 items 的子表：Item 一对多、Items 一对一
+        CodegenTableDO crmItemTable = getTable("contact").setModuleName("crm").setClassName("CrmItem")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType()).setSubJoinColumnId(100L).setSubJoinMany(true);
+        CodegenTableDO erpItemsTable = getTable("contact").setModuleName("erp").setClassName("ErpItems")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType()).setSubJoinColumnId(100L).setSubJoinMany(false);
+
+        // 调用
+        Map<String, String> result = codegenEngine.execute(DbType.MYSQL, table, columns,
+                Arrays.asList(crmItemTable, erpItemsTable),
+                Arrays.asList(getColumnList("contact"), getColumnList("contact")));
+        // 断言
+        assertTrue(result.containsKey("yudao-ui-admin-uniapp/src/pages-infra/demo/item/form/index.vue"));
+        assertTrue(result.containsKey("yudao-ui-admin-uniapp/src/pages-infra/demo/items/form/index.vue"));
+    }
+
+    @Test
+    public void testRegisterGeneratedSource_duplicatePath() {
+        // 准备参数
+        Map<String, String> generatedSources = new HashMap<>();
+        Map<String, Object> bindingMap = new HashMap<>();
+        bindingMap.put("subIndex", 0);
+        CodegenEngine.registerGeneratedSource(generatedSources, "same.vue", "form_sub.vm", bindingMap);
+        bindingMap.put("subIndex", 1);
+
+        // 调用
+        IllegalStateException exception = assertThrows(IllegalStateException.class,
+                () -> CodegenEngine.registerGeneratedSource(generatedSources, "same.vue", "form_sub.vm", bindingMap));
+        // 断言
+        assertTrue(exception.getMessage().contains("生成文件路径重复：same.vue"));
+        assertTrue(exception.getMessage().contains("form_sub.vm[subIndex=0]"));
+        assertTrue(exception.getMessage().contains("form_sub.vm[subIndex=1]"));
     }
 
     @Test
@@ -193,6 +281,46 @@ public class CodegenEngineUniappTest extends CodegenEngineAbstractTest {
         testExecute_master(CodegenTemplateTypeEnum.MASTER_ERP, "/vue3_admin_uniapp_master_erp");
     }
 
+    private void testExecute_duplicateMasterField(CodegenTemplateTypeEnum templateType) {
+        // 准备主表
+        CodegenTableDO table = getTable("student")
+                .setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
+                .setTemplateType(templateType.getType());
+        List<CodegenColumnDO> columns = getColumnList("student");
+        // 准备属性名同为 items 的子表：Item 一对多、Items 一对一
+        CodegenTableDO crmItemTable = getTable("contact").setModuleName("crm").setClassName("CrmItem")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType()).setSubJoinColumnId(100L).setSubJoinMany(true);
+        CodegenTableDO erpItemsTable = getTable("contact").setModuleName("erp").setClassName("ErpItems")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType()).setSubJoinColumnId(100L).setSubJoinMany(false);
+        List<CodegenColumnDO> crmItemColumns = getColumnList("contact");
+        List<CodegenColumnDO> erpItemsColumns = getColumnList("contact");
+
+        // 调用并断言
+        ServiceException exception = assertThrows(ServiceException.class,
+                () -> codegenEngine.execute(DbType.MYSQL, table, columns,
+                        Arrays.asList(crmItemTable, erpItemsTable), Arrays.asList(crmItemColumns, erpItemsColumns)));
+        assertTrue(exception.getMessage().contains("主子表属性名(items)重复"));
+    }
+
+    private void testExecute_duplicateMasterFieldWithMain(CodegenTemplateTypeEnum templateType) {
+        // 准备主表
+        CodegenTableDO table = getTable("student")
+                .setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
+                .setTemplateType(templateType.getType());
+        List<CodegenColumnDO> columns = getColumnList("student");
+        columns.stream().filter(column -> "memo".equals(column.getJavaField())).findFirst().orElseThrow()
+                .setJavaField("items");
+        // 准备一对多子表 Item，生成属性名 items
+        CodegenTableDO itemTable = getTable("contact").setModuleName("crm").setClassName("CrmItem")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType()).setSubJoinColumnId(100L).setSubJoinMany(true);
+
+        // 调用并断言
+        ServiceException exception = assertThrows(ServiceException.class,
+                () -> codegenEngine.execute(DbType.MYSQL, table, columns,
+                        List.of(itemTable), List.of(getColumnList("contact"))));
+        assertTrue(exception.getMessage().contains("主子表属性名(items)重复"));
+    }
+
     private void testExecute_master(CodegenTemplateTypeEnum templateType, String path) {
         // 准备主表
         CodegenTableDO table = getTable("student")
@@ -221,13 +349,16 @@ public class CodegenEngineUniappTest extends CodegenEngineAbstractTest {
             String api = result.get("yudao-ui-admin-uniapp/src/api/infra/demo/index.ts");
             assertTrue(api.contains("studentTeacher?: StudentTeacher | null"));
             String form = result.get("yudao-ui-admin-uniapp/src/pages-infra/demo/form/index.vue");
-            assertTrue(form.contains("ref<StudentTeacher | null>(null)"));
+            assertTrue(form.contains("ref<Partial<StudentTeacher> | null>(null)"));
             assertTrue(form.contains("studentTeacher.value = studentTeacherData || null"));
             assertTrue(form.contains(":model-value=\"item.birthday || Date.now()\""));
             assertTrue(form.contains("v-model=\"item.sex\""));
             assertTrue(form.contains("<yd-upload-img v-model=\"item.avatar\""));
             assertTrue(form.contains("<yd-upload-file v-model=\"item.video\""));
-            assertTrue(form.contains("<wd-textarea v-model=\"item.description\""));
+            assertTrue(form.contains("<yd-upload-file v-model=\"item.video\" :limit=\"1\""));
+            assertTrue(form.contains("v-model=\"item.description\""));
+            assertTrue(form.contains("v-model=\"item.memo\""));
+            assertTrue(form.contains("birthday: undefined"));
             assertTrue(form.contains("function validateSubTables()"));
         } else {
             String contactForm = result.get(
@@ -236,7 +367,11 @@ public class CodegenEngineUniappTest extends CodegenEngineAbstractTest {
             assertTrue(contactForm.contains("v-model=\"formData.sex\""));
             assertTrue(contactForm.contains("<yd-upload-img v-model=\"formData.avatar\""));
             assertTrue(contactForm.contains("<yd-upload-file v-model=\"formData.video\""));
-            assertTrue(contactForm.contains("<wd-textarea v-model=\"formData.description\""));
+            assertTrue(contactForm.contains("<yd-upload-file v-model=\"formData.video\" :limit=\"1\""));
+            assertTrue(contactForm.contains("v-model=\"formData.description\""));
+            assertTrue(contactForm.contains("v-model=\"formData.memo\""));
+            assertTrue(contactForm.contains("birthday: undefined"));
+            assertTrue(contactForm.contains(":columns=\"getBoolDictOptions"));
         }
     }
 
diff --git a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/form/index b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/form/index
index 0ab96ec..36cd18d 100644
--- a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/form/index
+++ b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/form/index
@@ -65,13 +65,15 @@
             <yd-upload-img v-model="formData.avatar" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="附件" title-width="180rpx" prop="video">
-            <yd-upload-file v-model="formData.video" directory="infra/demo" />
+            <yd-upload-file v-model="formData.video" :limit="1" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="备注" title-width="180rpx" prop="memo">
-            <wd-input
+            <wd-textarea
               v-model="formData.memo"
               clearable
               placeholder="请输入备注"
+              :maxlength="2000"
+              show-word-limit
             />
           </wd-form-item>
         </wd-cell-group>
@@ -120,13 +122,13 @@ definePage({
 const toast = useToast()
 const getTitle = computed(() => props.id ? '编辑学生' : '新增学生')
 const formLoading = ref(false) // 表单提交状态
-const formData = ref<Student>({
+const formData = ref<Partial<Student>>({
   id: undefined,
   name: '',
   description: '',
-  birthday: 0,
-  sex: 0,
-  enabled: false,
+  birthday: undefined,
+  sex: undefined,
+  enabled: undefined,
   avatar: '',
   video: '',
   memo: '',
@@ -166,7 +168,7 @@ async function handleSubmit() {
 
   formLoading.value = true
   try {
-    const data = formData.value
+    const data = formData.value as Student
     if (props.id) {
       await updateStudent(data)
       toast.success('修改成功')
diff --git a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/student-contact/form/index b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/student-contact/form/index
index 0cd009d..9b976da 100644
--- a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/student-contact/form/index
+++ b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/student-contact/form/index
@@ -10,7 +10,12 @@
           <wd-input v-model="formData.name" clearable placeholder="请输入名字" />
         </wd-form-item>
         <wd-form-item title="简介" title-width="180rpx" prop="description">
-          <wd-textarea v-model="formData.description" clearable placeholder="请输入简介" />
+          <wd-textarea
+            v-model="formData.description"
+            clearable
+            placeholder="请输入简介"
+            :maxlength="200"
+          />
         </wd-form-item>
         <wd-form-item
           title="出生日期"
@@ -40,17 +45,22 @@
           label="是否有效"
           label-width="180rpx"
           prop="enabled"
-          :dict-type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+          :columns="getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
           placeholder="请选择是否有效"
         />
         <wd-form-item title="头像" title-width="180rpx" prop="avatar">
           <yd-upload-img v-model="formData.avatar" directory="infra/demo" />
         </wd-form-item>
         <wd-form-item title="附件" title-width="180rpx" prop="video">
-          <yd-upload-file v-model="formData.video" directory="infra/demo" />
+          <yd-upload-file v-model="formData.video" :limit="1" directory="infra/demo" />
         </wd-form-item>
         <wd-form-item title="备注" title-width="180rpx" prop="memo">
-          <wd-input v-model="formData.memo" clearable placeholder="请输入备注" />
+          <wd-textarea
+            v-model="formData.memo"
+            clearable
+            placeholder="请输入备注"
+            :maxlength="2000"
+          />
         </wd-form-item>
       </wd-cell-group>
     </wd-form>
@@ -71,6 +81,7 @@ import { computed, onMounted, ref } from 'vue'
 import { useToast } from '@wot-ui/ui/components/wd-toast'
 import { createStudentContact, getStudentContact, updateStudentContact } from '@/api/infra/demo'
 import { delay, navigateBackPlus } from '@/utils'
+import { getBoolDictOptions } from '@/hooks/useDict'
 import { DICT_TYPE } from '@/utils/constants'
 import { formatDateTime } from '@/utils/date'
 import { createFormSchema } from '@/utils/wot'
@@ -87,14 +98,14 @@ definePage({
 const toast = useToast()
 const getTitle = computed(() => props.id ? '编辑学生联系人' : '新增学生联系人')
 const formLoading = ref(false) // 表单提交状态
-const formData = ref<StudentContact>({
+const formData = ref<Partial<StudentContact>>({
   id: undefined,
   studentId: props.studentId,
   name: '',
   description: '',
-  birthday: 0,
-  sex: 0,
-  enabled: false,
+  birthday: undefined,
+  sex: undefined,
+  enabled: undefined,
   avatar: '',
   video: undefined,
   memo: '',
@@ -132,7 +143,10 @@ async function handleSubmit() {
   }
   formLoading.value = true
   try {
-    const data = { ...formData.value, studentId: props.studentId ?? formData.value.studentId }
+    const data = {
+      ...formData.value,
+      studentId: props.studentId ?? formData.value.studentId,
+    } as StudentContact
     if (props.id) {
       await updateStudentContact(data)
       toast.success('修改成功')
diff --git a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/student-teacher/form/index b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/student-teacher/form/index
index cf44ec4..1d2639f 100644
--- a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/student-teacher/form/index
+++ b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_erp/vue/student-teacher/form/index
@@ -10,7 +10,12 @@
           <wd-input v-model="formData.name" clearable placeholder="请输入名字" />
         </wd-form-item>
         <wd-form-item title="简介" title-width="180rpx" prop="description">
-          <wd-textarea v-model="formData.description" clearable placeholder="请输入简介" />
+          <wd-textarea
+            v-model="formData.description"
+            clearable
+            placeholder="请输入简介"
+            :maxlength="200"
+          />
         </wd-form-item>
         <wd-form-item
           title="出生日期"
@@ -40,17 +45,22 @@
           label="是否有效"
           label-width="180rpx"
           prop="enabled"
-          :dict-type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+          :columns="getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
           placeholder="请选择是否有效"
         />
         <wd-form-item title="头像" title-width="180rpx" prop="avatar">
           <yd-upload-img v-model="formData.avatar" directory="infra/demo" />
         </wd-form-item>
         <wd-form-item title="附件" title-width="180rpx" prop="video">
-          <yd-upload-file v-model="formData.video" directory="infra/demo" />
+          <yd-upload-file v-model="formData.video" :limit="1" directory="infra/demo" />
         </wd-form-item>
         <wd-form-item title="备注" title-width="180rpx" prop="memo">
-          <wd-input v-model="formData.memo" clearable placeholder="请输入备注" />
+          <wd-textarea
+            v-model="formData.memo"
+            clearable
+            placeholder="请输入备注"
+            :maxlength="2000"
+          />
         </wd-form-item>
       </wd-cell-group>
     </wd-form>
@@ -71,6 +81,7 @@ import { computed, onMounted, ref } from 'vue'
 import { useToast } from '@wot-ui/ui/components/wd-toast'
 import { createStudentTeacher, getStudentTeacher, updateStudentTeacher } from '@/api/infra/demo'
 import { delay, navigateBackPlus } from '@/utils'
+import { getBoolDictOptions } from '@/hooks/useDict'
 import { DICT_TYPE } from '@/utils/constants'
 import { formatDateTime } from '@/utils/date'
 import { createFormSchema } from '@/utils/wot'
@@ -87,14 +98,14 @@ definePage({
 const toast = useToast()
 const getTitle = computed(() => props.id ? '编辑学生班主任' : '新增学生班主任')
 const formLoading = ref(false) // 表单提交状态
-const formData = ref<StudentTeacher>({
+const formData = ref<Partial<StudentTeacher>>({
   id: undefined,
   studentId: props.studentId,
   name: '',
   description: '',
-  birthday: 0,
-  sex: 0,
-  enabled: false,
+  birthday: undefined,
+  sex: undefined,
+  enabled: undefined,
   avatar: '',
   video: undefined,
   memo: '',
@@ -132,7 +143,10 @@ async function handleSubmit() {
   }
   formLoading.value = true
   try {
-    const data = { ...formData.value, studentId: props.studentId ?? formData.value.studentId }
+    const data = {
+      ...formData.value,
+      studentId: props.studentId ?? formData.value.studentId,
+    } as StudentTeacher
     if (props.id) {
       await updateStudentTeacher(data)
       toast.success('修改成功')
diff --git a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_inner/vue/form/index b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_inner/vue/form/index
index b533ad5..a43e177 100644
--- a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_inner/vue/form/index
+++ b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_inner/vue/form/index
@@ -65,13 +65,15 @@
             <yd-upload-img v-model="formData.avatar" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="附件" title-width="180rpx" prop="video">
-            <yd-upload-file v-model="formData.video" directory="infra/demo" />
+            <yd-upload-file v-model="formData.video" :limit="1" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="备注" title-width="180rpx" prop="memo">
-            <wd-input
+            <wd-textarea
               v-model="formData.memo"
               clearable
               placeholder="请输入备注"
+              :maxlength="2000"
+              show-word-limit
             />
           </wd-form-item>
         </wd-cell-group>
@@ -102,7 +104,12 @@
             <wd-input v-model="item.name" clearable placeholder="请输入名字" />
           </wd-form-item>
           <wd-form-item title="简介" title-width="180rpx">
-            <wd-textarea v-model="item.description" clearable placeholder="请输入简介" />
+            <wd-textarea
+              v-model="item.description"
+              clearable
+              placeholder="请输入简介"
+              :maxlength="200"
+            />
           </wd-form-item>
           <wd-form-item
             title="出生日期"
@@ -140,10 +147,15 @@
             <yd-upload-img v-model="item.avatar" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="附件" title-width="180rpx">
-            <yd-upload-file v-model="item.video" directory="infra/demo" />
+            <yd-upload-file v-model="item.video" :limit="1" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="备注" title-width="180rpx">
-            <wd-input v-model="item.memo" clearable placeholder="请输入备注" />
+            <wd-textarea
+              v-model="item.memo"
+              clearable
+              placeholder="请输入备注"
+              :maxlength="2000"
+            />
           </wd-form-item>
         </view>
       </view>
@@ -170,7 +182,12 @@
             <wd-input v-model="studentTeacher.name" clearable placeholder="请输入名字" />
           </wd-form-item>
           <wd-form-item title="简介" title-width="180rpx">
-            <wd-textarea v-model="studentTeacher.description" clearable placeholder="请输入简介" />
+            <wd-textarea
+              v-model="studentTeacher.description"
+              clearable
+              placeholder="请输入简介"
+              :maxlength="200"
+            />
           </wd-form-item>
           <wd-form-item
             title="出生日期"
@@ -208,10 +225,15 @@
             <yd-upload-img v-model="studentTeacher.avatar" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="附件" title-width="180rpx">
-            <yd-upload-file v-model="studentTeacher.video" directory="infra/demo" />
+            <yd-upload-file v-model="studentTeacher.video" :limit="1" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="备注" title-width="180rpx">
-            <wd-input v-model="studentTeacher.memo" clearable placeholder="请输入备注" />
+            <wd-textarea
+              v-model="studentTeacher.memo"
+              clearable
+              placeholder="请输入备注"
+              :maxlength="2000"
+            />
           </wd-form-item>
         </view>
       </view>
@@ -267,19 +289,19 @@ definePage({
 const toast = useToast()
 const getTitle = computed(() => props.id ? '编辑学生' : '新增学生')
 const formLoading = ref(false) // 表单提交状态
-const formData = ref<Student>({
+const formData = ref<Partial<Student>>({
   id: undefined,
   name: '',
   description: '',
-  birthday: 0,
-  sex: 0,
-  enabled: false,
+  birthday: undefined,
+  sex: undefined,
+  enabled: undefined,
   avatar: '',
   video: '',
   memo: '',
 }) // 表单数据
-const studentContacts = ref<StudentContact[]>([]) // 学生联系人数据
-const studentTeacher = ref<StudentTeacher | null>(null) // 学生班主任数据
+const studentContacts = ref<Partial<StudentContact>[]>([]) // 学生联系人数据
+const studentTeacher = ref<Partial<StudentTeacher> | null>(null) // 学生班主任数据
 const birthdayVisible = ref(false) // 出生日期选择器状态
 const subDateVisible = ref<Record<string, boolean>>({}) // 子表日期选择器状态
 const formSchema = createFormSchema({
@@ -299,9 +321,9 @@ function addStudentContact() {
   studentContacts.value.push({
     name: '',
     description: '',
-    birthday: 0,
-    sex: 0,
-    enabled: false,
+    birthday: undefined,
+    sex: undefined,
+    enabled: undefined,
     avatar: '',
     video: undefined,
     memo: '',
@@ -318,9 +340,9 @@ function addStudentTeacher() {
   studentTeacher.value = {
     name: '',
     description: '',
-    birthday: 0,
-    sex: 0,
-    enabled: false,
+    birthday: undefined,
+    sex: undefined,
+    enabled: undefined,
     avatar: '',
     video: undefined,
     memo: '',
@@ -429,11 +451,11 @@ async function handleSubmit() {
 
   formLoading.value = true
   try {
-    const data: Student = {
+    const data = {
       ...formData.value,
       studentContacts: studentContacts.value,
       studentTeacher: studentTeacher.value,
-    }
+    } as Student
     if (props.id) {
       await updateStudent(data)
       toast.success('修改成功')
diff --git a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_normal/vue/form/index b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_normal/vue/form/index
index b533ad5..a43e177 100644
--- a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_normal/vue/form/index
+++ b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_master_normal/vue/form/index
@@ -65,13 +65,15 @@
             <yd-upload-img v-model="formData.avatar" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="附件" title-width="180rpx" prop="video">
-            <yd-upload-file v-model="formData.video" directory="infra/demo" />
+            <yd-upload-file v-model="formData.video" :limit="1" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="备注" title-width="180rpx" prop="memo">
-            <wd-input
+            <wd-textarea
               v-model="formData.memo"
               clearable
               placeholder="请输入备注"
+              :maxlength="2000"
+              show-word-limit
             />
           </wd-form-item>
         </wd-cell-group>
@@ -102,7 +104,12 @@
             <wd-input v-model="item.name" clearable placeholder="请输入名字" />
           </wd-form-item>
           <wd-form-item title="简介" title-width="180rpx">
-            <wd-textarea v-model="item.description" clearable placeholder="请输入简介" />
+            <wd-textarea
+              v-model="item.description"
+              clearable
+              placeholder="请输入简介"
+              :maxlength="200"
+            />
           </wd-form-item>
           <wd-form-item
             title="出生日期"
@@ -140,10 +147,15 @@
             <yd-upload-img v-model="item.avatar" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="附件" title-width="180rpx">
-            <yd-upload-file v-model="item.video" directory="infra/demo" />
+            <yd-upload-file v-model="item.video" :limit="1" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="备注" title-width="180rpx">
-            <wd-input v-model="item.memo" clearable placeholder="请输入备注" />
+            <wd-textarea
+              v-model="item.memo"
+              clearable
+              placeholder="请输入备注"
+              :maxlength="2000"
+            />
           </wd-form-item>
         </view>
       </view>
@@ -170,7 +182,12 @@
             <wd-input v-model="studentTeacher.name" clearable placeholder="请输入名字" />
           </wd-form-item>
           <wd-form-item title="简介" title-width="180rpx">
-            <wd-textarea v-model="studentTeacher.description" clearable placeholder="请输入简介" />
+            <wd-textarea
+              v-model="studentTeacher.description"
+              clearable
+              placeholder="请输入简介"
+              :maxlength="200"
+            />
           </wd-form-item>
           <wd-form-item
             title="出生日期"
@@ -208,10 +225,15 @@
             <yd-upload-img v-model="studentTeacher.avatar" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="附件" title-width="180rpx">
-            <yd-upload-file v-model="studentTeacher.video" directory="infra/demo" />
+            <yd-upload-file v-model="studentTeacher.video" :limit="1" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="备注" title-width="180rpx">
-            <wd-input v-model="studentTeacher.memo" clearable placeholder="请输入备注" />
+            <wd-textarea
+              v-model="studentTeacher.memo"
+              clearable
+              placeholder="请输入备注"
+              :maxlength="2000"
+            />
           </wd-form-item>
         </view>
       </view>
@@ -267,19 +289,19 @@ definePage({
 const toast = useToast()
 const getTitle = computed(() => props.id ? '编辑学生' : '新增学生')
 const formLoading = ref(false) // 表单提交状态
-const formData = ref<Student>({
+const formData = ref<Partial<Student>>({
   id: undefined,
   name: '',
   description: '',
-  birthday: 0,
-  sex: 0,
-  enabled: false,
+  birthday: undefined,
+  sex: undefined,
+  enabled: undefined,
   avatar: '',
   video: '',
   memo: '',
 }) // 表单数据
-const studentContacts = ref<StudentContact[]>([]) // 学生联系人数据
-const studentTeacher = ref<StudentTeacher | null>(null) // 学生班主任数据
+const studentContacts = ref<Partial<StudentContact>[]>([]) // 学生联系人数据
+const studentTeacher = ref<Partial<StudentTeacher> | null>(null) // 学生班主任数据
 const birthdayVisible = ref(false) // 出生日期选择器状态
 const subDateVisible = ref<Record<string, boolean>>({}) // 子表日期选择器状态
 const formSchema = createFormSchema({
@@ -299,9 +321,9 @@ function addStudentContact() {
   studentContacts.value.push({
     name: '',
     description: '',
-    birthday: 0,
-    sex: 0,
-    enabled: false,
+    birthday: undefined,
+    sex: undefined,
+    enabled: undefined,
     avatar: '',
     video: undefined,
     memo: '',
@@ -318,9 +340,9 @@ function addStudentTeacher() {
   studentTeacher.value = {
     name: '',
     description: '',
-    birthday: 0,
-    sex: 0,
-    enabled: false,
+    birthday: undefined,
+    sex: undefined,
+    enabled: undefined,
     avatar: '',
     video: undefined,
     memo: '',
@@ -429,11 +451,11 @@ async function handleSubmit() {
 
   formLoading.value = true
   try {
-    const data: Student = {
+    const data = {
       ...formData.value,
       studentContacts: studentContacts.value,
       studentTeacher: studentTeacher.value,
-    }
+    } as Student
     if (props.id) {
       await updateStudent(data)
       toast.success('修改成功')
diff --git a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_one/vue/form/index b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_one/vue/form/index
index 0ab96ec..36cd18d 100644
--- a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_one/vue/form/index
+++ b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_one/vue/form/index
@@ -65,13 +65,15 @@
             <yd-upload-img v-model="formData.avatar" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="附件" title-width="180rpx" prop="video">
-            <yd-upload-file v-model="formData.video" directory="infra/demo" />
+            <yd-upload-file v-model="formData.video" :limit="1" directory="infra/demo" />
           </wd-form-item>
           <wd-form-item title="备注" title-width="180rpx" prop="memo">
-            <wd-input
+            <wd-textarea
               v-model="formData.memo"
               clearable
               placeholder="请输入备注"
+              :maxlength="2000"
+              show-word-limit
             />
           </wd-form-item>
         </wd-cell-group>
@@ -120,13 +122,13 @@ definePage({
 const toast = useToast()
 const getTitle = computed(() => props.id ? '编辑学生' : '新增学生')
 const formLoading = ref(false) // 表单提交状态
-const formData = ref<Student>({
+const formData = ref<Partial<Student>>({
   id: undefined,
   name: '',
   description: '',
-  birthday: 0,
-  sex: 0,
-  enabled: false,
+  birthday: undefined,
+  sex: undefined,
+  enabled: undefined,
   avatar: '',
   video: '',
   memo: '',
@@ -166,7 +168,7 @@ async function handleSubmit() {
 
   formLoading.value = true
   try {
-    const data = formData.value
+    const data = formData.value as Student
     if (props.id) {
       await updateStudent(data)
       toast.success('修改成功')
diff --git a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_tree/vue/form/index b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_tree/vue/form/index
index b39ccfe..26d3319 100644
--- a/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_tree/vue/form/index
+++ b/yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_tree/vue/form/index
@@ -71,7 +71,7 @@ definePage({
 const toast = useToast()
 const getTitle = computed(() => props.id ? '编辑分类' : '新增分类')
 const formLoading = ref(false) // 表单提交状态
-const formData = ref<Category>({
+const formData = ref<Partial<Category>>({
   id: undefined,
   name: '',
   parentId: props.parentId ?? 0,
@@ -105,7 +105,7 @@ async function handleSubmit() {
 
   formLoading.value = true
   try {
-    const data = formData.value
+    const data = formData.value as Category
     if (props.id) {
       await updateCategory(data)
       toast.success('修改成功')