Merge pull request #30 from tanwh/master

[mod]联动bug
[add]遗漏
Merge pull request #31 from qkhj/master

[add]遗漏
[modify]审批bug修复
Merge branch 'master' of https://github.com/qkhj/oa into qkhj-master

Conflicts:
	scapp/templates/index.html
Merge branch 'qkhj-master'
Merge pull request #11 from JohnCny/master

merge