fix avatar
修改onfirm
 Merge branch 'blithe' into 'master'

Blithe
修改#todo
 Merge branch 'blithe' into 'master'

Blithe
bug修复
from master
修改confirm方式
 Merge branch 'wxd' into 'master'

Wxd
通用流程返回
from master
 Merge branch 'wxd' into 'master'

Wxd
薪酬调整
 Merge branch 'blithe' into 'master'

Blithe
调薪添加原因
 Merge branch 'blithe' into 'master'

Blithe
报数管理主界面
add span style