feed: 同步牧场端饲料数据1

module/backend/pasture_sync_service.go

@@ -210,11 +210,7 @@ func (s *StoreEntry) FeedSyncData(ctx context.Context, req *operationPb.FeedForm
 				Page:      int32(page),
 				PageSize:  int32(pageSize),
 			}
-<<<<<<< HEAD
 			response := &model.FeedListResponse{}
-=======
-			response := &model.FeedFormulaListResponse{}
->>>>>>> develop
 			if _, err = s.PastureHttpClient(ctx, model.FeedAsyncUrl, int64(req.PastureId), body, response); err != nil {
 				return xerr.WithStack(err)
 			}