Merge pull request #34 from JohnCny/master

merge
[modify]数据库类型不一致导致绩效页面bug
[mod]加权毛利率计算
Merge pull request #116 from wangxu2013/master

[mod]加权毛利率计算
Merge pull request #114 from qkhj/master

modify
Merge pull request #75 from JohnCny/master

merge