Merge pull request #9 from JohnCny/master

merge
[mod]调整
Merge pull request #29 from qkhj/master

modify
Merge pull request #10 from JohnCny/master

merge
[mod]联动bug
Merge pull request #30 from tanwh/master

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

[add]遗漏
Merge branch 'master' of https://github.com/qkhj/oa into qkhj-master

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

[modify]财务审批bug
Merge pull request #6 from JohnCny/master

merge