fixed log date
完善页面展示
Merge branch 'master' of https://github.com/cuiken/UMS

Conflicts:
	src/main/webapp/WEB-INF/views/category/category.jsp
	src/main/webapp/WEB-INF/views/category/client-type.jsp
	src/main/webapp/WEB-INF/views/file/file.jsp
	src/main/webapp/WEB-INF/views/file/funlocker-client.jsp