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

Conflicts:
	scapp/templates/index.html
Merge branch 'qkhj-master'