模型配置第三步
Merge branch 'master' of https://github.com/coriger/supr.git

Conflicts:
	src/main/java/com/supr/blog/mapper/ModelMapper.java
	src/main/java/com/supr/blog/service/ModelService.java