Merge branch 'master' into fly

wangpengfei

2023-08-14 f84d9c46574a2cd663105859035bc17891270923

 model/serviceFollowup.go

@@ -16,9 +16,8 @@
      Number               string               `json:"number" gorm:"column:number;type:varchar(255);comment:合同编号"`
      ContactId            int                  `json:"contactId" gorm:"column:contact_id;type:int;comment:联系人id"`
      Contact              Contact              `json:"contact"  gorm:"foreignKey:ContactId"`
      ServiceId            int                  `json:"serviceId" gorm:"column:service_id;type:int;comment:客户服务单id"`
      ServiceOrder         ServiceOrder         `gorm:"foreignKey:ServiceId"`
      CustomerServiceSheet CustomerServiceSheet `json:"customerServiceSheet" gorm:"foreignKey:ServiceId"`
      ServiceOrderId int          `json:"serviceOrderId" gorm:"column:service_order_id;type:int;comment:客户服务单id"`
      ServiceOrder   ServiceOrder `gorm:"foreignKey:ServiceOrderId"`
      MemberId             int                  `json:"memberId" gorm:"column:member_id;type:int;comment:服务人员id"`
      Member               User                 `json:"Member" gorm:"foreignKey:MemberId"`
      PlanId               int                  `json:"planId" gorm:"column:plan_id;type:int;comment:服务计划id"`
@@ -144,6 +143,11 @@
   return slf
}

func (slf *ServiceFollowupSearch) SetServiceOrderId(id int) *ServiceFollowupSearch {
   slf.ServiceOrderId = id
   return slf
}

func (slf *ServiceFollowupSearch) SetPreload(preload bool) *ServiceFollowupSearch {
   slf.Preload = preload
   return slf