Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # 202410/机具大融合/20241016_bm_project表增加字段.sql
This commit is contained in:
commit
2d6979abf6
|
|
@ -3,5 +3,11 @@ ADD COLUMN `pro_code` varchar(60) NULL COMMENT '工程编号' AFTER `del_flag`,
|
||||||
ADD COLUMN `imp_unit` varchar(60) NULL COMMENT '实施单位' AFTER `pro_code`,
|
ADD COLUMN `imp_unit` varchar(60) NULL COMMENT '实施单位' AFTER `pro_code`,
|
||||||
ADD COLUMN `pro_nature` varchar(60) NULL COMMENT '工程性质(0 基建,1用户工程,2技能大改,3其他)' AFTER `imp_unit`,
|
ADD COLUMN `pro_nature` varchar(60) NULL COMMENT '工程性质(0 基建,1用户工程,2技能大改,3其他)' AFTER `imp_unit`,
|
||||||
ADD COLUMN `pro_status` varchar(60) NULL COMMENT '工程状态(0开工准备,1在建,2停工,3完全未竣工,4竣工)' AFTER `pro_nature`,
|
ADD COLUMN `pro_status` varchar(60) NULL COMMENT '工程状态(0开工准备,1在建,2停工,3完全未竣工,4竣工)' AFTER `pro_nature`,
|
||||||
ADD COLUMN `contract_part` varchar(60) NULL COMMENT '合同主体' AFTER `pro_status`,
|
ADD COLUMN `i8pro_id` bigint(11) NULL COMMENT 'i8工程id' AFTER `pro_status`,
|
||||||
|
ADD COLUMN `contract_part` varchar(60) NULL COMMENT '合同主体' AFTER `i8pro_id`,
|
||||||
ADD COLUMN `pro_center` varchar(60) NULL COMMENT '所属项目中心' AFTER `contract_part`;
|
ADD COLUMN `pro_center` varchar(60) NULL COMMENT '所属项目中心' AFTER `contract_part`;
|
||||||
|
|
||||||
|
|
||||||
|
-- 主键ID
|
||||||
|
alter table bm_project
|
||||||
|
modify pro_id int auto_increment comment '主键ID';
|
||||||
Loading…
Reference in New Issue