From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java | 61 ++++++++----------------------
1 files changed, 16 insertions(+), 45 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java
index 4ac72ba..cd277ac 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java
@@ -86,11 +86,6 @@
private String lifeCycleId;
/**
- * 鐢熷懡鍛ㄦ湡鐨勪腑鏂囧悕绉�
- */
- private String lifeCycleName;
-
- /**
* 鐗堟瑙勫垯
*/
private String versionRule;
@@ -104,11 +99,6 @@
* 澶囩敤鐢熷懡鍛ㄦ湡鑻辨枃鍚嶇О
*/
private String subLifeCycleId;
-
- /**
- * 澶囩敤鐢熷懡鍛ㄦ湡涓枃鍚嶇О
- */
- private String subLifeCycleName;
/**
* 鏄惁涓鸿鍥�
@@ -136,14 +126,9 @@
private String delimiter;
/**
- * 娣诲姞鎴栬�呯Щ闄ょ殑灞炴�т俊鎭�
- */
- private List<OsBtmTypeLinkAttributesDTO> attributes;
-
- /**
* 娣诲姞鎴栫Щ闄ょ殑灞炴��
*/
- private String[] apNameArray;
+ private String apNameArray;
/**
* 鏃堕棿鎴筹紝鐢ㄤ簬鏍￠獙鏄惁鏈�鏂版暟鎹�
@@ -170,11 +155,24 @@
*/
private Date lastModifyTime;
- public void setApNameArray(String[] apNameArray) {
+ /**
+ * 鍥剧墖鍚嶇О
+ */
+ private String imageName;
+
+ public void setImageName(String imageName) {
+ this.imageName = imageName;
+ }
+
+ public String getImageName() {
+ return imageName;
+ }
+
+ public void setApNameArray(String apNameArray) {
this.apNameArray = apNameArray;
}
- public String[] getApNameArray() {
+ public String getApNameArray() {
return apNameArray;
}
@@ -338,14 +336,6 @@
this.versionRule = versionRule;
}
- public List<OsBtmTypeLinkAttributesDTO> getAttributes() {
- return attributes;
- }
-
- public void setAttributes(List<OsBtmTypeLinkAttributesDTO> attributes) {
- this.attributes = attributes;
- }
-
public Date getTs() {
return ts;
}
@@ -386,28 +376,12 @@
this.lifeCycleId = lifeCycleId;
}
- public String getLifeCycleName() {
- return lifeCycleName;
- }
-
- public void setLifeCycleName(String lifeCycleName) {
- this.lifeCycleName = lifeCycleName;
- }
-
public String getSubLifeCycleId() {
return subLifeCycleId;
}
public void setSubLifeCycleId(String subLifeCycleId) {
this.subLifeCycleId = subLifeCycleId;
- }
-
- public String getSubLifeCycleName() {
- return subLifeCycleName;
- }
-
- public void setSubLifeCycleName(String subLifeCycleName) {
- this.subLifeCycleName = subLifeCycleName;
}
public String getClassFullName() {
@@ -436,14 +410,11 @@
", implClass='" + implClass + '\'' +
", shape='" + shape + '\'' +
", lifeCycleId='" + lifeCycleId + '\'' +
- ", lifeCycleName='" + lifeCycleName + '\'' +
", versionRule='" + versionRule + '\'' +
", subLifeCycleId='" + subLifeCycleId + '\'' +
- ", subLifeCycleName='" + subLifeCycleName + '\'' +
", viewFlag=" + viewFlag +
", viewCreateSql='" + viewCreateSql + '\'' +
", classFullName='" + classFullName + '\'' +
- ", attributes=" + attributes +
", ts=" + ts +
'}';
}
--
Gitblit v1.9.3