WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_2nd_period_test' into fix_2nd_period

Browse Source 
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/projectManagement/components/TaskList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
This commit is contained in:
高嵩
2022-12-28 09:53:38 +08:00
parent 34359f65a5 de7bfab8d1
commit 4633d465f3
81 changed files with 3221 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+41
View File
@@ -85,3 +85,44 @@ ALTER TABLE `laws_weilai`.`params_info_publish`
-- 上报库历史表，增加备注字段 2022-12-12 已同步生产环境
ALTER TABLE `laws_weilai`.`params_report_detail_log`
ADD COLUMN `remarks` varchar(4000) NULL COMMENT '备注' AFTER `params_report_detail_id`;
-- 创建用户项目权限表
CREATE TABLE `project_user_permission` (
`id` varchar(36) NOT NULL COMMENT '主键',
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
`create_time` datetime DEFAULT NULL COMMENT '创建日期',
`update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
`update_time` datetime DEFAULT NULL COMMENT '更新日期',
`project_id` varchar(255) DEFAULT NULL COMMENT '项目id',
`belong` varchar(255) DEFAULT NULL COMMENT '所属位置',
`description` text COMMENT '具体描述',
`user_id` varchar(255) DEFAULT NULL COMMENT '用户id',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 创建用户品牌表
CREATE TABLE `project_user_brand` (
`id` varchar(36) NOT NULL,
`user_id` varchar(255) DEFAULT NULL COMMENT '用户id',
`brand_type` varchar(255) DEFAULT NULL COMMENT '品牌类型',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 创建用户责任领域表
CREATE TABLE `project_user_duty_territory` (
`id` varchar(36) NOT NULL,
`user_id` varchar(255) DEFAULT NULL COMMENT '用户id',
`duty_territory` varchar(32) DEFAULT NULL COMMENT '责任领域',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 项目库基础表添加字段
ALTER TABLE `project_library_base`
ADD COLUMN `brand` varchar(255) NULL COMMENT '品牌' AFTER `flag`;
-- 法规技术评估表添加字段
ALTER TABLE `laws_technology_evaluation`
ADD COLUMN `brand` varchar(255) NULL COMMENT '品牌' AFTER `prc_num`;
-- 法规意见收集表添加字段
ALTER TABLE `laws_opinion_gather`
ADD COLUMN `brand` varchar(255) NULL COMMENT '品牌' AFTER `evaluator_ids`;