修改详情页面样式
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/views/main/product/detail.jsp
	src/main/webapp/resources/main/product/product-detail.css
修改详情页面样式