Merge branch 'release' of 47.111.118.107:wmtx/platform into release

Application/Admin/View/PromoteCompany/export.html

@@ -59,7 +59,7 @@
                     <td rowspan="{$data.row}">{$data.contact_begin} - {$data.contact_end}</td>
                     <td rowspan="{$data.row}">{$data.fax_ratio}%</td>
                     <td rowspan="{$data.row}">{$data.bank_name}</td>
-                    <td rowspan="{$data.row}">{$data.bank_card}</td>
+                    <td rowspan="{$data.row}">&nbsp;{$data.bank_card}</td>
                     <td rowspan="{$data.row}">{$data.is_sign_contact}</td>
                     <td rowspan="{$data.row}">{$data.content}</td>
                     <notempty name="data.list">

Data/update.sql

@@ -1320,3 +1320,15 @@ CREATE TABLE `tab_settlement_sheet` (
   `create_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+--2020-02-17 sunke修改默认值--
+ALTER TABLE `tab_promote_company`
+	CHANGE COLUMN `settlement_contact` `settlement_contact` VARCHAR(60) NOT NULL DEFAULT '' COMMENT '结算联系人' AFTER `last_up_time`,
+	CHANGE COLUMN `contact_phone` `contact_phone` BIGINT(12) NOT NULL DEFAULT '' COMMENT '联系电话' AFTER `settlement_contact`,
+	CHANGE COLUMN `address` `address` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '所在地址' AFTER `contact_phone`,
+	CHANGE COLUMN `bank_card` `bank_card` VARCHAR(60) NOT NULL DEFAULT '' COMMENT '银行卡号' AFTER `address`,
+	CHANGE COLUMN `bank_cardname` `bank_cardname` VARCHAR(60) NOT NULL DEFAULT '' COMMENT '银行卡名' AFTER `bank_card`,
+	CHANGE COLUMN `bank_name` `bank_name` VARCHAR(60) NOT NULL DEFAULT '' COMMENT '收款银行' AFTER `bank_cardname`,
+	CHANGE COLUMN `bank_address` `bank_address` VARCHAR(60) NOT NULL DEFAULT '' COMMENT '开户网点' AFTER `bank_name`,
+	CHANGE COLUMN `platform_name` `platform_name` VARCHAR(60) NOT NULL DEFAULT '' COMMENT '平台名称' AFTER `bank_address`,
+	CHANGE COLUMN `contact_begin` `contact_begin` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '合同开始时间' AFTER `platform_name`;