PADMIN-1218 充值小改动
字体等等
js变化
列表样式
列表样式
Revert "列表样式"

This reverts commit e959445a1d2b43d739cc73062bbb84d24515ac85.
Revert "Revert "列表样式""

This reverts commit 523fee3a20d290d4c676463dd75042ac6ec33289.
Merge branch 'dev' of https://github.com/qatang/cms

Conflicts:
	src/main/webapp/WEB-INF/jsp/user/userList.jsp
	src/main/webapp/index.jsp
Merge branch 'dev' of https://github.com/qatang/cms into qatang-dev

Conflicts:
	sql/tables.sql
	src/main/java/com/qatang/cms/controller/menu/MenuController.java
	src/main/java/com/qatang/cms/controller/role/RoleController.java
	src/main/java/com/qatang/cms/dao/menu/MenuDao.java
	src/main/java/com/qatang/cms/dao/role/RoleDao.java
	src/main/java/com/qatang/cms/entity/menu/Menu.java
	src/main/java/com/qatang/cms/entity/role/Role.java
	src/main/java/com/qatang/cms/form/AbstractPagingForm.java
	src/main/java/com/qatang/cms/form/menu/MenuForm.java
	src/main/java/com/qatang/cms/form/role/RoleForm.java
	src/main/java/com/qatang/cms/service/impl/role/RoleServiceImpl.java
	src/main/java/com/qatang/cms/service/role/RoleService.java
	src/main/java/com/qatang/cms/validator/impl/menu/MenuValidator.java
	src/main/webapp/WEB-INF/jsp/menu/menuInput.jsp
	src/main/webapp/WEB-INF/jsp/menu/menuList.jsp
	src/main/webapp/WEB-INF/jsp/role/roleInput.jsp
	src/main/webapp/WEB-INF/jsp/role/roleList.jsp
	src/main/webapp/WEB-INF/jsp/user/userList.jsp
	src/main/webapp/index.jsp
Merge branch 'dev' of https://github.com/qatang/cms into qatang-dev

Conflicts:
	src/main/webapp/WEB-INF/jsp/user/userList.jsp
Merge pull request #7 from qatang/dev

merge
merge
角色更新
角色更新
角色更新
角色更新
css change
menu include jsp
角色更新
Merge pull request #49 from JSHgithub/master

a new pull request