Merge pull request #24 from JohnCny/master

merge
[modify]工资计算
Merge pull request #75 from qkhj/master

add
Merge pull request #50 from JohnCny/master

merge