Merge "fix grant swagger error"