Revert "Merge branch 'master' of https://github.com/fengye92/HospitalAssist"

This reverts commit b6a25c89a797c3a716d76a3c598106971b38e9a7.

Merge branch 'master' of
https://github.com/fengye92/HospitalAssist

Conflicts:
	WebContent/pages/common/header.jsp

用户设置
Merge branch 'master' of https://github.com/fengye92/HospitalAssist

Conflicts:
	WebContent/pages/common/header.jsp