Merge pull request #34 from JohnCny/master

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

modify