test
Merge remote-tracking branch 'upstream/master'
[mod]工时统计导出EXCEL BUG修复
Merge pull request #16 from tanwh/master

[mod]权益交叉bug
Merge remote-tracking branch 'upstream/master'
[mod]交叉检验计算
[add]标准检测页面
Merge pull request #17 from wangxu2013/master

[add]标准检测页面[mod]交叉检验计算
Merge pull request #11 from JohnCny/master

merge