1,session使用之后,关闭;
2,js对象化封装
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/sz/site7road/controller/base/BaseController.java
	src/main/java/com/sz/site7road/controller/base/BaseGridController.java
	src/main/java/com/sz/site7road/controller/base/BaseTreeController.java
	src/main/java/com/sz/site7road/controller/role/RoleGridController.java
	src/main/java/com/sz/site7road/dao/base/BaseDaoImpl.java
	src/main/resources/message.properties
	src/main/webapp/WEB-INF/admin/auth/form.ftl
	src/main/webapp/WEB-INF/admin/common/home.ftl
	src/main/webapp/WEB-INF/admin/common/resource.ftl
	src/main/webapp/WEB-INF/admin/role/form.ftl
	src/main/webapp/WEB-INF/admin/role/index.ftl
	src/main/webapp/WEB-INF/admin/usr/form.ftl
	src/main/webapp/WEB-INF/admin/usr/index.ftl
	src/main/webapp/static/js/easyui/themes/icon.css
	src/main/webapp/static/js/sys/common.js
选择图标