Merge pull request #34 from JohnCny/master

merge
[modify]数据库类型不一致导致绩效页面bug
Merge pull request #115 from wangxu2013/master

[mod]修改贷款申请页面bug，损益自动计算，交叉检验录入方式修改
Merge pull request #74 from JohnCny/master

merge
Merge pull request #116 from wangxu2013/master

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

modify
Merge pull request #75 from JohnCny/master

merge
兴化修改
Merge pull request #117 from tanwh/master

兴化修改
Merge remote-tracking branch 'upstream/master'