Merge pull request #47 from JohnCny/master

merge
[add]在岗考核
Merge pull request #72 from tanwh/master

[add]在岗考核