hibernate hql连表查询
Merge branch 'master' of https://github.com/warrior701/ComRBAC.git

Conflicts:
	CommonRBAC/src/com/singlee/rbac/domain/org/Oper.java