From 7671e43ac2efef812f6a6a8e8e4890b40090dc43 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 9 Nov 2022 11:03:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=8F=82=E6=95=B0-bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/collect/mapper/xml/ParamsManifestEOMapper.xml | 4 ++-- .../modules/todoCenter/entity/ParamsManifestTodoCenterEO.java | 4 ++-- jero-web/src/views/toDoCenter/projectParameterTasks/index.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 1fc8997c5..2c220de0c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -128,8 +128,8 @@ pm.state as state, pm.project_id as project_id, pm.create_time as create_time, - pm.project_version as project_version, - concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.version) as project_name + pm.version as version, + concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.project_version) as project_name from params_manifest pm left join project_library_base as plb on plb.id = pm.project_id left join project_name_info as pni on plb.project_name_id = pni.id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java index e3ef18811..b985f82ea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java @@ -22,9 +22,9 @@ public class ParamsManifestTodoCenterEO { private String title; /** - * 相关项目版本 + * 相关清单版本 */ - private String projectVersion; + private String version; /** * 待发起数量 包括状态：待发起收集,变更,工程接口人退回 diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue index b344f8299..c9c06c08c 100644 --- a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue @@ -116,7 +116,7 @@ { title: this.$t('relatedVersion'), align: 'center', - dataIndex: 'projectVersion', + dataIndex: 'version', ellipsis: true, width: 170, scopedSlots: { customRender: 'projectVersion' }