[wang]
[wang]
[wang]Merge branch 'master' of https://github.com/dongamp1990/BasePJ.git

Conflicts:
	WebContent/WEB-INF/jsp/server/company/companyAdd.jsp