actionLog流水表实时热门
Merge branch 'dev_liqian' of https://github.com/liqian008/designer into
dev_liqian

Conflicts:
	designer-front/src/main/java/com/bruce/designer/front/controller/AlbumController.java
	designer-front/src/main/java/com/bruce/designer/front/controller/DesignerController.java
	designer-service/src/main/java/com/bruce/designer/service/IHotService.java
	designer-service/src/main/java/com/bruce/designer/service/impl/HotServiceImpl.java