Merge branch 'hotfix/fix_wrq_error'
tijiaoyixa
Merge branch 'hotfix/xinbuding' into develop