From d11a1d722ecad7427a4ad2160a6c12d547f3b169 Mon Sep 17 00:00:00 2001
From: ly258liuyue <50605650+ly258liuyue@users.noreply.github.com>
Date: Tue, 20 Jul 2021 11:43:25 +0800
Subject: [PATCH] fix model colname error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复gorm.model 导出问题
---
 data/view/model/common.go | 66 +++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/data/view/model/common.go b/data/view/model/common.go
index 547efd3..e725544 100755
--- a/data/view/model/common.go
+++ b/data/view/model/common.go
@@ -113,39 +113,43 @@ func getUninStr(left, middle, right string) string {
 	return re
 }
 
-func getGormModelElement() []EmInfo {
-	var result []EmInfo
-	result = append(result, EmInfo{
-		IsMulti:       false,
-		Notes:         "Primary key",
-		Type:          "int64", // Type.类型标记
-		ColName:       "id",
-		ColStructName: "ID",
-	})
-	result = append(result, EmInfo{
-		IsMulti:       false,
-		Notes:         "created time",
-		Type:          "time.Time", // Type.类型标记
-		ColName:       "created_at",
-		ColStructName: "CreatedAt",
-	})
+func getGormModelElement() []EmInfo {
+    var result []EmInfo
+    result = append(result, EmInfo{
+        IsMulti:       false,
+        Notes:         "Primary key",
+        Type:          "int64", // Type.类型标记
+        ColName:       "id",
+        ColNameEx:     "id",
+        ColStructName: "ID",
+    })
+    result = append(result, EmInfo{
+        IsMulti:       false,
+        Notes:         "created time",
+        Type:          "time.Time", // Type.类型标记
+        ColName:       "created_at",
+        ColNameEx:     "created_at",
+        ColStructName: "CreatedAt",
+    })
 
-	result = append(result, EmInfo{
-		IsMulti:       false,
-		Notes:         "updated at",
-		Type:          "time.Time", // Type.类型标记
-		ColName:       "updated_at",
-		ColStructName: "UpdatedAt",
-	})
+    result = append(result, EmInfo{
+        IsMulti:       false,
+        Notes:         "updated at",
+        Type:          "time.Time", // Type.类型标记
+        ColName:       "updated_at",
+        ColNameEx:     "updated_at",
+        ColStructName: "UpdatedAt",
+    })
 
-	result = append(result, EmInfo{
-		IsMulti:       false,
-		Notes:         "deleted time",
-		Type:          "time.Time", // Type.类型标记
-		ColName:       "deleted_at",
-		ColStructName: "DeletedAt",
-	})
-	return result
+    result = append(result, EmInfo{
+        IsMulti:       false,
+        Notes:         "deleted time",
+        Type:          "time.Time", // Type.类型标记
+        ColName:       "deleted_at",
+        ColNameEx:     "deleted_at",
+        ColStructName: "DeletedAt",
+    })
+    return result
 }
 
 func buildFList(list *[]FList, key ColumnsKey, keyName, tp, colName string) {