说明修改
Merge branch 'master' of https://github.com/coriger/suprBlog.git

Conflicts:
	supr/supr-blog/blog-core/src/main/java/com/supr/blog/dao/mongodb/BaseDao.java
	supr/supr-blog/pom.xml