From 72bab1219cbca2e53adb98dc9113ae1f85298cf8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 19 八月 2024 14:06:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
index 94ff8ad..8ba5e9e 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
@@ -1,5 +1,7 @@
package com.vci.pagemodel;
+import com.vci.starter.web.pagemodel.Tree;
+
import java.util.Date;
import java.util.List;
@@ -54,11 +56,6 @@
* 鐗堟湰瑙勫垯鐨勫悕绉�
*/
private String revisionRuleName;
-
- /**
- * 鍒嗛殧绗�
- */
- private String revisionSep;
/**
* 鏄惁鎵嬪姩杈撳叆鐗堟湰
@@ -123,7 +120,7 @@
/**
* 澶囩敤鐢熷懡鍛ㄦ湡鑻辨枃鍚嶇О
*/
- private String subLifeCycleId;
+ private String lifeCycleIds;
/**
* 澶囩敤鐢熷懡鍛ㄦ湡涓枃鍚嶇О
@@ -268,14 +265,6 @@
public void setRevisionRuleName(String revisionRuleName) {
this.revisionRuleName = revisionRuleName;
- }
-
- public String getRevisionSep() {
- return revisionSep;
- }
-
- public void setRevisionSep(String revisionSep) {
- this.revisionSep = revisionSep;
}
public boolean isInputRevisionFlag() {
@@ -423,12 +412,12 @@
this.lifeCycleName = lifeCycleName;
}
- public String getSubLifeCycleId() {
- return subLifeCycleId;
+ public String getLifeCycleIds() {
+ return lifeCycleIds;
}
- public void setSubLifeCycleId(String subLifeCycleId) {
- this.subLifeCycleId = subLifeCycleId;
+ public void setLifeCycleIds(String lifeCycleIds) {
+ this.lifeCycleIds = lifeCycleIds;
}
public String getSubLifeCycleName() {
@@ -481,7 +470,7 @@
", description='" + description + '\'' +
", revisionRuleId='" + revisionRuleId + '\'' +
", revisionRuleName='" + revisionRuleName + '\'' +
- ", revisionSep='" + revisionSep + '\'' +
+ ", delimiter='" + delimiter + '\'' +
", inputRevisionFlag=" + inputRevisionFlag +
", revisionRuleVO=" + revisionRuleVO +
", abstractFlag=" + abstractFlag +
@@ -493,7 +482,7 @@
", lifeCycleId='" + lifeCycleId + '\'' +
", lifeCycleName='" + lifeCycleName + '\'' +
", versionRule='" + versionRule + '\'' +
- ", subLifeCycleId='" + subLifeCycleId + '\'' +
+ ", lifeCycleIds='" + lifeCycleIds + '\'' +
", subLifeCycleName='" + subLifeCycleName + '\'' +
", viewFlag=" + viewFlag +
", viewCreateSql='" + viewCreateSql + '\'' +
--
Gitblit v1.9.3