样式调整
修改
Merge branch 'master' of https://github.com/welcomejiong/panel

Conflicts:
	panel-web/src/main/webapp/WEB-INF/ftl/archive/index.ftl
	panel-web/src/main/webapp/WEB-INF/ftl/hezuo/huobaotietu.ftl
	panel-web/src/main/webapp/WEB-INF/ftl/hezuo/jinghua.ftl
	panel-web/src/main/webapp/WEB-INF/ftl/hezuo/remen.ftl
	panel-web/src/main/webapp/WEB-INF/ftl/hezuo/shishang.ftl
	panel-web/src/main/webapp/static/js/archive/archive.js
	panel-web/src/main/webapp/static/js/libs.js