Merge branch 'master' into fly

wangpengfei

2023-08-02 b4201a0054369a8cd89e940947fd6f1a89f357c2

 service/serviceFollowup.go

@@ -29,15 +29,6 @@
   return ecode.OK
}

func (FollowupService) GetServiceFollowupList() ([]*model.ServiceFollowup, int) {
   list, err := model.NewServiceFollowupSearch().FindAll()
   if err != nil {
      return nil, ecode.ServiceFollowupListErr
   }

   return list, ecode.OK
}

func (FollowupService) UpdateServiceFollowup(serviceFollowup *model.ServiceFollowup) int {
   // check serviceFollowup exist
   _, err := model.NewServiceFollowupSearch().SetId(serviceFollowup.Id).Find()
@@ -52,3 +43,12 @@

   return ecode.OK
}

func (FollowupService) GetServiceFollowupList(page, pageSize int, keyword string) ([]*model.ServiceFollowup, int64, int) {
   // get contact list
   contacts, total, err := model.NewServiceFollowupSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
   if err != nil {
      return nil, 0, ecode.ServiceFollowupListErr
   }
   return contacts, total, ecode.OK
}