~jiangyouyao/beauty-erp.git

			@@ -207,7 +207,6 @@
			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`;


			@@ -227,7 +226,9 @@
			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`,