model-base
Merge branch 'master' of https://github.com/cjjlovecjj/model-base

Conflicts:
	.gitignore
	src/main/java/com/blow/baseModel/mapper/ProductDAO.java