From d7aa0c40191ac24bdf7c546bbed52066a61e2033 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 24 八月 2023 10:55:24 +0800
Subject: [PATCH] Merge branch 'hotfix'

---
 model/model.go |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/model/model.go b/model/model.go
index 922de37..d8f51a2 100644
--- a/model/model.go
+++ b/model/model.go
@@ -25,14 +25,16 @@
 
 type CrmModel struct {
 	gorm.Model  `json:"-"`
-	CreatorId   int       `json:"-" gorm:"column:creator_id;type:int;comment:鍒涘缓浜篿d"`
-	Creator     User      `json:"-"  gorm:"foreignKey:CreatorId"`
-	CreateTime  time.Time `json:"createTime"  gorm:"-"`
-	CreatorName string    `json:"creatorName" gorm:"-"`
+	CreatorId   int    `json:"-" gorm:"column:creator_id;type:int;comment:鍒涘缓浜篿d"`
+	Creator     User   `json:"-"  gorm:"foreignKey:CreatorId"`
+	CreateTime  string `json:"createTime"  gorm:"-"`
+	UpdateTime  string `json:"updateTime"  gorm:"-"`
+	CreatorName string `json:"creatorName" gorm:"-"`
 }
 
 func (slf *CrmModel) AfterFind(tx *gorm.DB) (err error) {
 	slf.CreatorName = slf.Creator.Username
-	slf.CreateTime = slf.CreatedAt
+	slf.CreateTime = slf.CreatedAt.Format("2006-01-02 15:04")
+	slf.UpdateTime = slf.UpdatedAt.Format("2006-01-02 15:04")
 	return nil
 }

--
Gitblit v1.8.0