diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
index c41c50619..b0f89994e 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
@@ -141,7 +141,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
 		table.setDsName(dsName);
 		table.setTableComment(MapUtil.getStr(queryTable, "tableComment"));
 		table.setDbType(MapUtil.getStr(queryTable, "dbType"));
-		table.setFormLayout(FormLayoutEnum.ONE.getValue());
+		table.setFormLayout(FormLayoutEnum.TWO.getValue());
 		table.setGeneratorType(GeneratorTypeEnum.ZIP_DOWNLOAD.ordinal());
 		table.setClassName(NamingCase.toPascalCase(tableName));
 		table.setModuleName(GenKit.getModuleName(table.getPackageName()));
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java
index 679589bd8..07564ff99 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java
@@ -217,7 +217,8 @@ public class GeneratorServiceImpl implements GeneratorService {
 		// 获取字段列表
 		List<GenTableColumnEntity> fieldList = columnService.lambdaQuery()
 				.eq(GenTableColumnEntity::getDsName, table.getDsName())
-				.eq(GenTableColumnEntity::getTableName, table.getTableName()).list();
+				.eq(GenTableColumnEntity::getTableName, table.getTableName())
+				.orderByAsc(GenTableColumnEntity::getSort).list();
 		table.setFieldList(fieldList);
 
 		// 创建数据模型对象
@@ -249,6 +250,8 @@ public class GeneratorServiceImpl implements GeneratorService {
 		dataModel.put("fieldList", table.getFieldList());
 		dataModel.put("backendPath", table.getBackendPath());
 		dataModel.put("frontendPath", table.getFrontendPath());
+		dataModel.put("vAuthName", table.getClassName().toLowerCase());
+		dataModel.put("i18nName", StrUtil.lowerFirst(table.getClassName()));
 
 		return dataModel;
 	}