~jiangyouyao/beauty-erp.git

			@@ -191,6 +191,9 @@
			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;

			@@ -198,3 +201,43 @@
			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`
			ADD COLUMN `score_pay` int(20) NULL COMMENT '支付积分' AFTER `company_id`;


			ALTER TABLE `shop_advertis`
			ADD COLUMN `page_id` bigint(0) NULL COMMENT '连接页面' AFTER `company_id`;

			ALTER TABLE `shop_sku`
			DROP COLUMN `self_price`,
			ADD COLUMN `self_price` decimal(20,2) NULL AFTER `score_count`;

			ALTER TABLE `shop_salesman_grade`
			DROP COLUMN `self_commission`,
			ADD COLUMN `self_commission` double(20,2) NULL COMMENT '自购返佣比例%' AFTER `company_id`;


			ALTER TABLE `money_card_use_flow`
			ADD COLUMN `pay_no` varchar(32) NULL COMMENT '微信充值订单号';


			ALTER TABLE `shop_order`
			ADD COLUMN `pay_method` int(2) NULL COMMENT '支付方式1微信，2 vipCard余额';
			update shop_order set pay_method=1;

			ALTER TABLE `sys_vip_info`
			ADD COLUMN `fenxiao_state` int(11) NULL DEFAULT NULL COMMENT '分销审核状态' AFTER `recommend_id`,
			ADD COLUMN `withdrawal_cash` double(20, 2) NULL DEFAULT NULL COMMENT '可提现金额' AFTER `fenxiao_state`,
			ADD COLUMN `salesman_grade` bigint(20) NULL DEFAULT NULL COMMENT '推广员等级' AFTER `withdrawal_cash`,
			ADD COLUMN `is_sales` int(1) NULL DEFAULT NULL AFTER `salesman_grade`,
			ADD COLUMN `user_is_authorize` datetime(0) NULL DEFAULT NULL AFTER `is_sales`,
			ADD COLUMN `binding_parent_time` datetime(0) NULL DEFAULT NULL AFTER `user_is_authorize`,
			ADD COLUMN `country` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `binding_parent_time`,
			ADD COLUMN `gender` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `country`,
			ADD COLUMN `nick_name` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `gender`,
			ADD COLUMN `avatar_url` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `nick_name`;