From 3ab162ae650e8783ef1728c02bd880ab6d82f869 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 13 Jan 2020 17:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/update.sql | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/Data/update.sql b/Data/update.sql
index 847724597..580b72df0 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -917,26 +917,6 @@ ADD COLUMN `beta_url` varchar(150) NOT NULL DEFAULT '' COMMENT 'Beta链接';
 ALTER TABLE `tab_game`
 ADD COLUMN `pay_config` varchar(255) NOT NULL COMMENT '支付渠道 wx 微信 zfb 支付宝 quick 快捷 (gf 官方 sq 双乾';
 
-<<<<<<< HEAD
--- 2019-12-30
--- 会长管理后台提现 cxj
-ALTER TABLE `tab_withdraw`
-ADD COLUMN `settlement_begin_time` int(10) NOT NULL DEFAULT 0 COMMENT '结算开始时间' AFTER `old_promote_account`;
-ALTER TABLE `tab_withdraw`
-ADD COLUMN `op_id` int(11) NOT NULL DEFAULT 0 COMMENT '操作id';
-ALTER TABLE `tab_withdraw`
-ADD COLUMN `op_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '操作人：1-推广员 2-管理员 3-自动';
-ALTER TABLE `tab_withdraw`
-ADD COLUMN `last_op_id` int(11) NOT NULL DEFAULT 0 COMMENT '最后操作人id',
-ADD COLUMN `last_op_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '最后操作人：1-推广员 2-管理员 3-自动';
-
--- 2019-12-31
--- 推广员结算类型 cxj
-ALTER TABLE `tab_promote`
-ADD COLUMN `settlement_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '结算类型：1-周结 2-月结';
-
-=======
->>>>>>> release
 ALTER TABLE tab_promote add `company_belong` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会归属：0-内团；1-外团';
 ALTER TABLE tab_promote add `company_relation` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会关系：0-自主开发及维护；1-只维护';
 -- 游戏的合作方新增联系人，联系电话，邮寄地址,公司税号，收款方名称，银行账号，开户行 liuweiwen  2020-01-03