s生产product list 修改
Merge branch 'master' of https://github.com/liu4ze4heng4/ikea.git

Conflicts:
	ikea-tow/resources/ikea_product0
	ikea-tow/resources/ikea_product1
	ikea-tow/resources/ikea_product10
	ikea-tow/resources/ikea_product2
	ikea-tow/resources/ikea_product3
	ikea-tow/resources/ikea_product4
	ikea-tow/resources/ikea_product5
	ikea-tow/resources/ikea_product6
	ikea-tow/resources/ikea_product7
	ikea-tow/resources/ikea_product8
	ikea-tow/resources/ikea_product9
	ikea-tow/src/main/java/com/fec/shop/util/IkeaUtils.java