From 20f6ea1b89070f17b1d9f47e9c5e349f0c87c37d Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 24 八月 2023 11:03:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 model/serviceFollowup.go |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/model/serviceFollowup.go b/model/serviceFollowup.go
index a5fb79d..fc3b09d 100644
--- a/model/serviceFollowup.go
+++ b/model/serviceFollowup.go
@@ -33,8 +33,7 @@
 		OldMember      User         `json:"oldMember" gorm:"foreignKey:OldMemberId"`
 		Remark         string       `json:"remark" gorm:"column:remark;type:text;comment:澶囨敞"`
 		File           string       `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"`
-
-		gorm.Model `json:"-"`
+		CrmModel
 	}
 
 	ServiceFollowupSearch struct {
@@ -49,7 +48,7 @@
 	}
 )
 
-func (ServiceFollowup) TableName() string {
+func (*ServiceFollowup) TableName() string {
 	return "service_followup"
 }
 

--
Gitblit v1.8.0