default sync
Merge branch 'master' of https://github.com/TYD-QKJ/qkjebiz.git

Conflicts:
	WebContent/jsp/manager/default.jsp