产品规格
Merge branch 'master' of https://github.com/Foboy/GoGoJP

# By xcoolray
# Via xcoolray
* 'master' of https://github.com/Foboy/GoGoJP:
  comet
Merge branch 'master' of https://github.com/Foboy/GoGoJP

# By zhengrunqiang
# Via zhengrunqiang
* 'master' of https://github.com/Foboy/GoGoJP:
  商品参数
  123
  123
  添加产品

Conflicts:
	Application/Home/Model/StandardModel.class.php
Merge branch 'master' of https://github.com/Foboy/GoGoJP

# By zhengrunqiang
# Via zhengrunqiang
* 'master' of https://github.com/Foboy/GoGoJP:
  修改数据库