Merge pull request #10 from JohnCny/master

merge
[mod]工时统计导出EXCEL BUG修复
[mod]交叉检验bug
Merge pull request #16 from tanwh/master

[mod]权益交叉bug
Merge remote-tracking branch 'upstream/master'