Merge branch 'hotfix'

zhangqian

2023-08-25 5421f9d925a15eddfcaf356839ee1a180b36689a

 service/serviceFollowup.go

@@ -41,13 +41,14 @@
   return ecode.OK
}

func (FollowupService) GetServiceFollowupList(page, pageSize int, keywordType constvar.ServiceFollowupKeywordType, keyword string) ([]*model.ServiceFollowup, int64, int) {
func (FollowupService) GetServiceFollowupList(page, pageSize int, keywordType constvar.ServiceFollowupKeywordType, keyword string, serviceOrderId int) ([]*model.ServiceFollowup, int64, int) {
   // get contact list
   contacts, total, err := model.NewServiceFollowupSearch().
      SetKeywordType(keywordType).
      SetKeyword(keyword).
      SetPage(page, pageSize).
      SetPreload(true).
      SetServiceOrderId(serviceOrderId).
      FindAll()
   if err != nil {
      return nil, 0, ecode.ServiceFollowupListErr