使图标和文字在同一行显示
Merge branch 'feather_password_edit' into develop