From 5e1aa408c1b8bd36fefd0b5ea380a2fde6d57810 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 十二月 2023 17:35:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM

---
 global/model.go |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/global/model.go b/global/model.go
index b4594ee..9a3d5b1 100644
--- a/global/model.go
+++ b/global/model.go
@@ -7,10 +7,10 @@
 )
 
 type GVA_MODEL struct {
-	ID        uint           `gorm:"primarykey"`     // 涓婚敭ID
-	CreatedAt *time.Time     `json:"-"`              // 鍒涘缓鏃堕棿
-	UpdatedAt *time.Time     `json:"-"`              // 鏇存柊鏃堕棿
-	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"` // 鍒犻櫎鏃堕棿
+	ID        uint           `json:"id" gorm:"primarykey"` // 涓婚敭ID
+	CreatedAt *time.Time     `json:"-"`                    // 鍒涘缓鏃堕棿
+	UpdatedAt *time.Time     `json:"-"`                    // 鏇存柊鏃堕棿
+	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`       // 鍒犻櫎鏃堕棿
 
 	FormattedCreatedAt string `gorm:"-" json:"created_at"`
 	FormattedUpdatedAt string `gorm:"-" json:"updated_at"`
@@ -21,3 +21,13 @@
 	m.FormattedUpdatedAt = m.UpdatedAt.Format("2006-01-02 15:04:05")
 	return
 }
+
+type GVA_MODEL_INT struct {
+	ID        uint           `json:"id,string" gorm:"primarykey"` // 涓婚敭ID
+	CreatedAt *time.Time     `json:"-"`                           // 鍒涘缓鏃堕棿
+	UpdatedAt *time.Time     `json:"-"`                           // 鏇存柊鏃堕棿
+	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`              // 鍒犻櫎鏃堕棿
+
+	FormattedCreatedAt string `gorm:"-" json:"created_at"`
+	FormattedUpdatedAt string `gorm:"-" json:"updated_at"`
+}

--
Gitblit v1.8.0