Merge pull request #23 from JohnCny/master

merge
[add]风险保证金计算，总工资计算
Merge branch 'master' of https://github.com/qkhj/xhsc into qkhj-master

Conflicts:
	scapp/logic/performanceMapper.py
[mod] merge,格式修正
Merge pull request #49 from JohnCny/master

merge