定义 product solr bean
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/supr/blog/model/vo/Product.java