manman-code
diff --git a/‎XlsxToLua/Properties/AssemblyInfo.cs‎
Lines changed: 2 additions & 2 deletions b/‎XlsxToLua/Properties/AssemblyInfo.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎XlsxToLua/TableAnalyzeHelper.cs‎
Lines changed: 2 additions & 0 deletions b/‎XlsxToLua/TableAnalyzeHelper.cs‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎XlsxToLua/XlsxToLua.v12.suo‎
1 KB b/‎XlsxToLua/XlsxToLua.v12.suo‎
1 KB
diff --git a/‎XlsxToLua/bin/Debug/XlsxToLua.exe‎
0 Bytes b/‎XlsxToLua/bin/Debug/XlsxToLua.exe‎
0 Bytes
diff --git a/‎XlsxToLua/bin/Release/XlsxToLua.exe‎
0 Bytes b/‎XlsxToLua/bin/Release/XlsxToLua.exe‎
0 Bytes
@@ -32,5 +32,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
+[assembly: AssemblyVersion("6.1.0.0")]
+[assembly: AssemblyFileVersion("6.1.0.0")]
@@ -82,6 +82,8 @@ public static TableInfo AnalyzeTable(DataTable dt, string tableName, out string
 
         // 存储定义过的字段名，不允许有同名字段（key：字段名， value：列号）
         Dictionary<string, int> fieldNames = new Dictionary<string, int>();
+        // 先加入主键列
+        fieldNames.Add(tableInfo.GetKeyColumnFieldInfo().FieldName, 0);
         // 解析剩余的列
         while (curColumnIndex < dt.Columns.Count)
         {
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@ public static TableInfo AnalyzeTable(DataTable dt, string tableName, out string`
`82`	`82`
`83`	`83`	`// 存储定义过的字段名，不允许有同名字段（key：字段名， value：列号）`
`84`	`84`	`Dictionary<string, int> fieldNames = new Dictionary<string, int>();`
	`85`	`+ // 先加入主键列`
	`86`	`+ fieldNames.Add(tableInfo.GetKeyColumnFieldInfo().FieldName, 0);`
`85`	`87`	`// 解析剩余的列`
`86`	`88`	`while (curColumnIndex < dt.Columns.Count)`
`87`	`89`	`{`