Merge pull request #21 from JohnCny/master

merge
Merge pull request #69 from tanwh/master

[add]培训期考核
Merge pull request #22 from JohnCny/master

merge
[add]晋级审核、晋级脚本生成
[add]转移
[add]晋级审核、晋级脚本生成
[add]培训期评估计算
Merge pull request #71 from wangxu2013/master

[add]培训期评估计算
Merge pull request #70 from qkhj/master

add
Merge pull request #47 from JohnCny/master

merge