重构enum
Merge branch 'master' of https://github.com/liqian008/baseFramework.git

Conflicts:
	baseFramework-admin/src/main/java/com/bruce/baseAdmin/controller/security/AdminRoleController.java
	baseFramework-admin/src/main/java/com/bruce/baseAdmin/controller/security/AdminUserController.java
	baseFramework-admin/src/main/java/com/bruce/baseAdmin/dao/IUserDaoImpl.java
	baseFramework-admin/src/main/java/com/bruce/baseAdmin/service/security/impl/AdminResourceServiceImpl.java
	baseFramework-admin/src/main/java/com/bruce/baseAdmin/service/security/impl/AdminRoleServiceImpl.java
	baseFramework-admin/src/main/resources/mybatis-conf-admin.xml
	baseFramework-service/src/main/java/com/bruce/base/dao/IBaseDao.java