commit
Merge branch 'master' of https://github.com/liqian008/designer.git

Conflicts:
	designer-front/src/main/java/com/bruce/designer/front/controller/FrontController.java
	designer-front/src/main/resources/spring/applicationContext-dao.xml
	designer-service/src/main/java/com/bruce/designer/bean/TbAlbum.java
	designer-service/src/main/java/com/bruce/designer/bean/TbAlbumContent.java
	designer-service/src/main/java/com/bruce/designer/bean/TbAlbumContentCriteria.java
	designer-service/src/main/java/com/bruce/designer/bean/TbAlbumCriteria.java
	designer-service/src/main/java/com/bruce/designer/bean/TbComment.java
	designer-service/src/main/java/com/bruce/designer/bean/TbCommentCriteria.java
	designer-service/src/main/java/com/bruce/designer/bean/TbDesigner.java
	designer-service/src/main/java/com/bruce/designer/bean/TbDesignerCriteria.java
	designer-service/src/main/java/com/bruce/designer/bean/TbMessage.java
	designer-service/src/main/java/com/bruce/designer/bean/TbMessageCriteria.java
	designer-service/src/main/java/com/bruce/designer/bean/TbUser.java
	designer-service/src/main/java/com/bruce/designer/bean/TbUserCriteria.java
	designer-service/src/main/java/com/bruce/designer/bean/mapper/TbAlbumContentMapper.xml
	designer-service/src/main/java/com/bruce/designer/bean/mapper/TbAlbumMapper.xml
	designer-service/src/main/java/com/bruce/designer/bean/mapper/TbCommentMapper.xml
	designer-service/src/main/java/com/bruce/designer/bean/mapper/TbDesignerMapper.xml
	designer-service/src/main/java/com/bruce/designer/bean/mapper/TbMessageMapper.xml
	designer-service/src/main/java/com/bruce/designer/bean/mapper/TbUserMapper.xml
	designer-service/src/main/java/com/bruce/designer/dao/TbAlbumContentMapper.java
	designer-service/src/main/java/com/bruce/designer/dao/TbAlbumMapper.java
	designer-service/src/main/java/com/bruce/designer/dao/TbCommentMapper.java
	designer-service/src/main/java/com/bruce/designer/dao/TbDesignerMapper.java
	designer-service/src/main/java/com/bruce/designer/dao/TbMessageMapper.java
	designer-service/src/main/java/com/bruce/designer/dao/TbUserMapper.java
	designer-service/src/main/java/com/bruce/designer/service/AlbumService.java
	designer-service/src/main/java/com/bruce/designer/service/impl/AlbumServiceImpl.java
	designer-service/src/main/java/com/bruce/designer/service/impl/CommentServiceImpl.java