Merge branch 'develop' of http://git.yoho.cn/platform/yohobuy-doc into develop

-ALTER TABLE erp_product.storage ADD `upm_code` VARCHAR(100) DEFAULT '' COMMENT 'upm条码';
-ALTER TABLE erp_supplier.base_single ADD `upm_code` VARCHAR(100) DEFAULT '' COMMENT 'upm条码';
+ALTER TABLE erp_product.storage ADD `upm_code` VARCHAR(100) DEFAULT '' COMMENT 'upm条码';                   -- 平台化二期优化
+ALTER TABLE erp_supplier.base_single ADD `upm_code` VARCHAR(100) DEFAULT '' COMMENT 'upm条码';      
+create index product_factory_code on erp_product.product(factory_code);
+
+-- 退换货
+alter table erp_product.product_sort add COLUMN is_refund_exchange tinyint(1) unsigned NOT NULL DEFAULT '1';
+alter table yh_shops.product_sort add COLUMN is_refund_exchange tinyint(1) unsigned NOT NULL DEFAULT '1';
+
 
 -- 定时变价
 ALTER TABLE erp_product.product_price ADD effective_time INT COMMENT '生效时间';
@@ -7,14 +13,7 @@ ALTER TABLE erp_product.product_price ADD cgprice_start_time INT(10) COMMENT 'å
 ALTER TABLE erp_product.product_price ADD cgprice_end_time INT(10) COMMENT '变价结束时间';
 ALTER TABLE erp_product.product_price ADD tmp_cgprice_status SMALLINT(6) COMMENT '临时变价是否结束';
 
-
-alter table erp_product.product_sort add COLUMN is_refund_exchange tinyint(1) unsigned NOT NULL DEFAULT '1';
-alter table yh_shops.product_sort add COLUMN is_refund_exchange tinyint(1) unsigned NOT NULL DEFAULT '1';
-
-
-create index product_factory_code on erp_product.product(factory_code);
-
-
+-- 定时变价
 ALTER TABLE erp_product.product_price ADD change_price_type SMALLINT (6);
 
 CREATE TABLE `erp_product`.`product_price_plan` (