Merge branch 'master' of https://github.com/nazavoya/bora-platform.git

Conflicts:
	bora-platform/WebRoot/WEB-INF/boot/cache/ehcache.xml
	bora-platform/WebRoot/WEB-INF/boot/log4j/log4j.xml
	bora-platform/WebRoot/WEB-INF/boot/sitemesh/sitemesh.xml
	bora-platform/WebRoot/WEB-INF/boot/spring/activiti/activiti-context.xml.bak
	bora-platform/WebRoot/WEB-INF/boot/spring/dbpm/dblink/@bora-platform/bora-platform-context.xml
	bora-platform/WebRoot/WEB-INF/boot/spring/dbpm/transaction/transaction-context.xml
	bora-platform/WebRoot/WEB-INF/boot/spring/lucene/lucene-context.xml
	bora-platform/WebRoot/WEB-INF/boot/spring/security/security-context.xml
	bora-platform/WebRoot/WEB-INF/boot/spring/web/web-context.xml
	bora-platform/WebRoot/WEB-INF/boot/urlrewrite/urlrewrite.xml
	bora-platform/WebRoot/commons/resources/jsp/segment/_script.jsp
	bora-platform/WebRoot/commons/resources/jsp/segment/_style.jsp
	bora-platform/WebRoot/index.jsp
	bora-platform/WebRoot/login.jsp
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/dao/GroupTypeMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/dao/MenuTypeMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/dao/RoleTypeMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/dao/UserStatusMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/dao/UserTypeMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/mapper/GroupTypeMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/mapper/MenuTypeMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/mapper/RoleTypeMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/mapper/UserStatusMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/mapper/UserTypeMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/model/GroupType.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/model/GroupTypeExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/model/MenuType.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/model/MenuTypeExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/model/RoleType.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/model/RoleTypeExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/model/UserStatus.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/model/UserStatusExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/model/UserType.java
	bora-platform/src/main/java/com/zxcxco/bora/console/dbpm/dd/model/UserTypeExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/dao/CompanyDetailViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/dao/CompanyListViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/dao/CompanyMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/dao/DepartmentDetailViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/dao/DepartmentListViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/dao/DepartmentMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/dao/PersonDetailViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/dao/PersonListViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/dao/PersonMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/mapper/CompanyDetailViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/mapper/CompanyListViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/mapper/CompanyMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/mapper/DepartmentDetailViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/mapper/DepartmentListViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/mapper/DepartmentMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/mapper/PersonDetailViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/mapper/PersonListViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/mapper/PersonMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/Company.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/CompanyDetailView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/CompanyDetailViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/CompanyExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/CompanyListView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/CompanyListViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/Department.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/DepartmentDetailView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/DepartmentDetailViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/DepartmentExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/DepartmentListView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/DepartmentListViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/Person.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/PersonDetailView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/PersonDetailViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/PersonExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/PersonListView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/organization/model/PersonListViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/GroupDetailViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/GroupListViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/GroupMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/GroupRoleMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/MenuDetailViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/MenuListViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/MenuMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/PolicyMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/RoleDetailViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/RoleListViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/RoleMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/RoleMenuMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/UserDetailViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/UserGroupMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/UserListViewMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/UserMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/dao/UserRoleMapper.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/GroupDetailViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/GroupListViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/GroupMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/GroupRoleMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/MenuDetailViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/MenuListViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/MenuMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/PolicyMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/RoleDetailViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/RoleListViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/RoleMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/RoleMenuMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/UserDetailViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/UserGroupMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/UserListViewMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/UserMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/mapper/UserRoleMapper.xml
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/Group.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/GroupDetailView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/GroupDetailViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/GroupExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/GroupListView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/GroupListViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/GroupRole.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/GroupRoleExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/Menu.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/MenuDetailView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/MenuDetailViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/MenuExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/MenuListView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/MenuListViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/Policy.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/PolicyExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/Role.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/RoleDetailView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/RoleDetailViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/RoleExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/RoleListView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/RoleListViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/RoleMenu.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/RoleMenuExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/User.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/UserDetailView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/UserDetailViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/UserExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/UserGroup.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/UserGroupExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/UserListView.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/UserListViewExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/UserRole.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/model/UserRoleExample.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/service/LoginService.java
	bora-platform/src/main/java/com/zxcxco/bora/console/security/web/LoginController.java
	bora-platform/src/main/java/com/zxcxco/bora/platform/commons/pagination/dialect/MySQLDialect.java
	bora-platform/src/main/java/com/zxcxco/bora/platform/commons/pagination/dialect/OracleDialect.java
	bora-platform/src/main/java/com/zxcxco/bora/platform/commons/pagination/dialect/PostgreSQLDialect.java
	bora-platform/src/main/java/com/zxcxco/bora/platform/commons/tree/TreeBuilder.java
	bora-platform/src/main/java/com/zxcxco/bora/platform/commons/tree/TreeNode.java
	bora-platform/src/main/java/com/zxcxco/bora/platform/security/auth/PlatformFilterInvocationSecurityMetadataSource.java
	bora-platform/src/main/java/com/zxcxco/bora/platform/security/auth/PlatformRoleHierarchyManager.java
	bora-platform/src/main/java/com/zxcxco/bora/platform/security/auth/PlatformUserDetailsManager.java
	bora-platform/src/tool/java/com/zxcxco/tool/database/script/bora-platform.backup
	bora-platform/src/tool/java/com/zxcxco/tool/database/script/bora-platform.sql

Change-Id: Ie935a9def0782d8239e0d91c139adaf6e61afaca
Signed-off-by: nazavoya <nazavoya@qq.com>
Merge branch 'master' of https://github.com/nazavoya/bora-platform.git