|
|
@@ -1,4 +1,3 @@
|
|
|
-<<<<<<< HEAD
|
|
|
ALTER TABLE `zh_material`
|
|
|
ADD COLUMN `rate_tp` decimal(30, 8) NULL DEFAULT NULL COMMENT '建筑含税总金额' AFTER `rate`;
|
|
|
|
|
|
@@ -411,7 +410,7 @@ ALTER TABLE `zh_rpt_tree_node_cust`
|
|
|
ADD COLUMN `tender_id` INT NULL DEFAULT -1 COMMENT '新需求，跟标段走，不跟客户走' AFTER `cust_acc_id`,
|
|
|
ADD INDEX `tender` (`tender_id` ASC);
|
|
|
;
|
|
|
-=======
|
|
|
+
|
|
|
CREATE TABLE `zh_stage_yjcl` (
|
|
|
`id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
|
|
|
`uuid` varchar(36) NOT NULL DEFAULT '' COMMENT 'uuid',
|
|
|
@@ -444,4 +443,3 @@ CREATE TABLE `zh_stage_yjcl` (
|
|
|
`shistory` text NULL COMMENT '审批历史',
|
|
|
PRIMARY KEY (`id`)
|
|
|
);
|
|
|
->>>>>>> ed5450efff3314fa73d5c52cc3a3b3c91df57401
|
