Merge branch 'master' into fly

wangpengfei

2023-08-14 7eedd56f7d315f6fa4e2c0dcda1b35107e8bfbad

 model/serviceOrder.go

@@ -92,15 +92,19 @@
   if slf.Preload {
      db = db.
         Preload("Client").
         Preload("Contract").
         Preload("OrderManage").
         Preload("ServiceContract").
         Preload("SalesDetails").
         Preload("Product").
         Preload("ServiceType").
         Preload("Contact").
         Preload("SaleChance").
         Preload("PriorityLevel").
         Preload("SaleChance").
         Preload("FaultType").
         Preload("Severity").
         Preload("ServiceOrderStatus").
         Preload("TimeSpent").
         Preload("Faq")

   }
   switch slf.KeywordType {
   case constvar.ServiceOrderKeywordClientName: