Merge branch 'master' of https://github.com/NewLifeX/NewLife.XCode

NewLifeX · Sep 28, 2023 · d5c01a0 · d5c01a0
2 parents 9fd3e98 + 7beef61
commit d5c01a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/XCode/Code/EntityBuilder.cs b/XCode/Code/EntityBuilder.cs
@@ -234,6 +234,7 @@ protected virtual void AddNameSpace()
         us.Add("XCode.Cache");
         us.Add("XCode.Configuration");
         us.Add("XCode.DataAccessLayer");
+        us.Add("System.ComponentModel.DataAnnotations");//属性验证
         //us.Add("XCode.Common");
         if (Business) us.Add("XCode.Shards");
 

diff --git a/XCode/DataAccessLayer/Model/ModelHelper.cs b/XCode/DataAccessLayer/Model/ModelHelper.cs
@@ -378,8 +378,7 @@ static IDataTable ProcessNeedHistory(IDataTable table)
         col.DataType = typeof(DateTime);
         col.Name = table.Name + "ID";
         col.DataType = typeof(Int32);
-        //Customer @Id@$
-        col.Map = table.Name + "@ID@$";
+        col.Map = $"{table.Name}@ID@$@{table.Name}Info";
         historydataTable.Columns.Insert(1, col);
 
         return historydataTable;