Merge remote-tracking branch 'origin/master'

jnby-pomme/合并清理.sql

--- 数据合并
+-- 数据合并
@@ -10,7 +10,7 @@ insert into tab_gic_mall_collection             select * from tab_gic_mall_colle
 insert into tab_gic_mall_evaluate               select * from tab_gic_mall_evaluate_copy;
 insert into tab_gic_mall_order_batch_deliver_log select * from tab_gic_mall_order_batch_deliver_log_copy;
 insert into tab_gic_mall_shopping_cart           select * from tab_gic_mall_shopping_cart_copy;
-insert into `gic3.0`.tab_gic_member_address      select * from `gic3.0`.tab_gic_member_address;
+insert into `gic3.0`.tab_gic_member_address      select * from `gic3.0`.tab_gic_member_address_copy;
 
 
  -- 清空中间表