conflict: feat: support resolve svc.ports[].appProtocol (#2601) (f28b342)#308

ronething wants to merge 1 commit intomasterapi7/api7-ingress-controller:masterfrom

backport/f28b342-to-masterapi7/api7-ingress-controller:backport/f28b342-to-masterCopy head branch name to clipboard