portal 组件以及门户根结构代码改造 80%
Merge branch 'master' of https://github.com/waitwind/jinhe-daodao

Conflicts:
	portal/src/main/java/com/jinhe/tss/portal/dao/IPortalDao.java
	portal/src/main/java/com/jinhe/tss/portal/dao/impl/PortalDao.java
	portal/src/main/java/com/jinhe/tss/portal/entity/Structure.java
	portal/src/main/java/com/jinhe/tss/portal/entity/ThemeInfo.java
	portal/src/main/java/com/jinhe/tss/portal/service/impl/PortalService.java