上传公共类
上传文件公共类
Merge branch 'master' of https://github.com/dongamp1990/BasePJ.git

Conflicts:
	WebContent/WEB-INF/jsp/server/left.jsp