~jiangyouyao/beauty-erp.git

			@@ -180,3 +180,32 @@
			PRIMARY KEY(id)
			)ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='分销订单';

			biz_user原来的userId改成了自增长的bigint


			ALTER TABLE `shop_sku`
			ADD COLUMN `score_price` decimal(10, 2) NULL COMMENT '积分兑换价格' AFTER `invitation_price`;

			ALTER TABLE `shop_product`
			ADD COLUMN `score_category_id` bigint(20) NULL COMMENT '积分商城分类ID' AFTER `company_id`,
			ADD COLUMN `able_sales` int(2) NULL COMMENT '是否为分销产品1是2不是' AFTER `score_category_id`,
			ADD COLUMN `able_score_pay` int(2) NULL COMMENT '是否可用积分支付1是2不是' AFTER `able_sales`;

			ALTER TABLE `shop_shopping_cart`
			ADD COLUMN `cart_type` int(2) NOT NULL COMMENT '购物车类型 1微商城 2积分商城' AFTER `company_id`;

			update shop_product set able_score_pay=1;
			update shop_product set able_sales=2;

			ALTER TABLE `shop_sku`
			MODIFY COLUMN `score_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '兑换所需支付价格' AFTER `invitation_price`,
			ADD COLUMN `score_count` decimal(10, 2) NULL COMMENT '兑换所需积分数量' AFTER `score_price`;

			ALTER TABLE `shop_order_details`
			ADD COLUMN `pay_type` int(2) NULL COMMENT '支付方式1 直接购买 2，积分兑换' AFTER `company_id`,
			ADD COLUMN `score_count` decimal(20, 2) NULL COMMENT '支付积分单价' AFTER `pay_type`,
			ADD COLUMN `total_score_count` decimal(20, 2) NULL COMMENT '支付总积分' AFTER `score_count`;

			ALTER TABLE `shop_order`
			DROP COLUMN `score_pay`,
			ADD COLUMN `score_pay` int(20) NULL COMMENT '支付积分' AFTER `company_id`;