From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001 From: 田源 <tianyuan@vci-tech.com> Date: 星期四, 16 一月 2025 16:19:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java index ff0c654..06dcba4 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java @@ -228,7 +228,7 @@ VersionRule newVR = new VersionRule(); newVR.oid = osRevisionRuleDTO.getOid(); newVR.name = osRevisionRuleDTO.getId(); - newVR.tag = osRevisionRuleDTO.getName(); + newVR.label = osRevisionRuleDTO.getName(); newVR.description = osRevisionRuleDTO.getDescription(); newVR.jumpCharacter = osRevisionRuleDTO.getJumpCharacter(); newVR.initialValue = osRevisionRuleDTO.getInitialValue(); @@ -283,7 +283,7 @@ } ruleVO.setDescription(versionRule.description); ruleVO.setId(versionRule.name); - ruleVO.setName(versionRule.tag); + ruleVO.setName(versionRule.label); ruleVO.setStepLength(WebUtil.getInt(versionRule.stepLength)); ruleVO.setJumpCharacter(versionRule.jumpCharacter); ruleVO.setPrefixion(versionRule.prefixion); -- Gitblit v1.9.3