Merge branch 'net5.0' into net6.0

2022-05-03 19:38:21 +08:00
parent a8891c299c ccf81ff828
commit b791233eaf
8 changed files with 141 additions and 47 deletions
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -452,7 +452,7 @@ namespace ZR.CodeGenerator
                TableId = genTable.TableId,
                TableName = genTable.TableName,
                CsharpType = GetCSharpDatatype(column.DataType),
-                CsharpField = column.DbColumnName.UnderScoreToCamelCase().FirstUpperCase(),
+                CsharpField = column.DbColumnName.ConvertToPascal("_"),
                IsRequired = !column.IsNullable,
                IsIncrement = column.IsIdentity,
                Create_by = genTable.Create_by,