Error cherry-picking PR #7220 into release-v5.1:
Auto-merging controllers/account/controllers/debt.go
Auto-merging service/account/dao/interface.go
Auto-merging service/account/deploy/charts/account-service/templates/deployment.yaml
Auto-merging service/account/deploy/charts/account-service/values.yaml
CONFLICT (content): Merge conflict in service/account/deploy/charts/account-service/values.yaml
Auto-merging service/go.work.sum
CONFLICT (content): Merge conflict in service/go.work.sum
error: could not apply beea1e5... feat(account): expose admin account read APIs (#7220)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Error cherry-picking PR #7220 into release-v5.1:
Auto-merging controllers/account/controllers/debt.go
Auto-merging service/account/dao/interface.go
Auto-merging service/account/deploy/charts/account-service/templates/deployment.yaml
Auto-merging service/account/deploy/charts/account-service/values.yaml
CONFLICT (content): Merge conflict in service/account/deploy/charts/account-service/values.yaml
Auto-merging service/go.work.sum
CONFLICT (content): Merge conflict in service/go.work.sum
error: could not apply beea1e5... feat(account): expose admin account read APIs (#7220)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"