From 7eedd56f7d315f6fa4e2c0dcda1b35107e8bfbad Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 17:57:20 +0800
Subject: [PATCH] Merge branch 'master' into fly

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

diff --git a/model/serviceFollowup.go b/model/serviceFollowup.go
index 004bfc3..4a175e3 100644
--- a/model/serviceFollowup.go
+++ b/model/serviceFollowup.go
@@ -82,16 +82,15 @@
 	}
 
 	if slf.Preload {
-		db = db.Preload("CustomerServiceSheet").
-			Preload("ServiceOrder").
-			Preload("Client").
+		db = db.Preload("Client").
 			Preload("Contact").
+			Preload("ServiceOrder").
+			Preload("Member").
 			Preload("Satisfaction").
 			Preload("TimelyRate").
 			Preload("SolveRate").
 			Preload("IsVisit").
-			Preload("OldMember").
-			Preload("Member")
+			Preload("OldMember")
 	}
 
 	return db

--
Gitblit v1.8.0