Merge branch 'feature_dev_20230105_ZDYBT'

# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/projectManagement/components/customizeList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
This commit is contained in:
高嵩
2023-02-11 22:10:12 +08:00
14 changed files with 1364 additions and 238 deletions
@@ -160,6 +160,23 @@ ALTER TABLE `laws_weilai`.`params_report_detail`
-- 更新拆分详情列 展示顺序不在列表头展示sql 2022-12-30 已同步生产环境
UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '1529373706885799937'
-- 自定义表头 2023-01-05 未同步生产环境
CREATE TABLE `laws_weilai`.`head_custom` (
`id` varchar(36) NOT NULL COMMENT 'id',
`create_by` varchar(255) NULL COMMENT '创建人',
`create_time` datetime(0) NULL COMMENT '创建时间',
`update_by` varchar(255) NULL COMMENT '修改人',
`update_time` datetime(0) NULL COMMENT '修改时间',
`sys_org_code` varchar(255) NULL COMMENT '部门',
`head_field_cn` varchar(255) NULL COMMENT '表头字段中文',
`head_field_en` varchar(255) NULL COMMENT '表头字段英文',
`parent_id` varchar(36) NULL COMMENT '父id',
`module_flag` varchar(255) NULL COMMENT '模块标识',
`sort` varchar(255) NULL COMMENT '排序',
`field` varchar(255) NULL COMMENT '对应列表接口字段名',
`affirm_flag` varchar(36) NULL COMMENT '确认标识',
PRIMARY KEY (`id`));
-- 项目库置顶 2023-1-12 已同步生产环境
CREATE TABLE `top_project` (
`id` varchar(36) NOT NULL,