From bce5128f2b33735774e0777b00bca4ca4a61962a Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期五, 27 十二月 2024 18:16:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsAttributeVO.java | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsAttributeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsAttributeVO.java
index fcaacaa..4de3c81 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsAttributeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsAttributeVO.java
@@ -43,6 +43,14 @@
* 灞炴�х被鍨嬫樉绀烘枃鏈�
*/
private String attributeDataTypeText;
+ /**
+ * 灞炴�I鎺т欢鏄剧ず绫诲瀷
+ */
+ private String attributeUIType;
+ /**
+ * 灞炴�I鎺т欢鏄剧ず绫诲瀷鏂囨湰
+ */
+ private String attributeUITypeText;
/**
* 鏄惁鍙互涓虹┖
@@ -64,7 +72,6 @@
*/
private String enumName;
-
/**
* 鍙傜収鐨勪笟鍔＄被鍨嬬紪鍙�
*/
@@ -74,6 +81,16 @@
* 鍙傜収鐨勪笟鍔＄被鍨嬪悕绉�
*/
private String btmTypeName;
+
+ /**
+ * 鍙傜収鐨勯摼鎺ョ被鍨嬪悕绉�
+ */
+ private String linkTypeName;
+
+ /**
+ * 閫夋嫨浜嗛摼鎺ョ被鍨嬫椂閫夋嫨鐨勭増鏈�
+ */
+ private Integer version;
/**
* 灞炴�х殑闀垮害
@@ -96,7 +113,12 @@
private String range;
/**
- * 涓氬姟绫诲瀷鍚嶇О,鏄�艰繖鏉℃暟鎹殑涓氬姟绫诲瀷锛屼笉鏄睘鎬ф墍灞炵殑涓氬姟绫诲瀷
+ * 瀛楁涓哄弬鐓ф椂鍙傜収鐨勭浉鍏冲睘鎬�
+ */
+ private String other;
+
+ /**
+ * 涓氬姟绫诲瀷鍚嶇О,鏄�艰繖鏉℃暟鎹殑涓氬姟绫诲瀷锛屼笉鏄睘鎬ф墍灞炵殑涓氬姟绫诲瀷锛屽簲璇ユ槸涓氬姟绫诲瀷涓哄睘鎬ф睜
*/
private String btmname;
@@ -129,6 +151,14 @@
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
private Date ts;
+
+ public String getOther() {
+ return other;
+ }
+
+ public void setOther(String other) {
+ this.other = other;
+ }
public String getOid() {
return oid;
@@ -226,6 +256,22 @@
this.btmTypeName = btmTypeName;
}
+ public String getLinkTypeName() {
+ return linkTypeName;
+ }
+
+ public void setLinkTypeName(String linkTypeName) {
+ this.linkTypeName = linkTypeName;
+ }
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
public Integer getAttrLength() {
return attrLength;
}
@@ -315,6 +361,22 @@
this.scaleLength = scaleLength;
}
+ public String getAttributeUIType() {
+ return attributeUIType;
+ }
+
+ public void setAttributeUIType(String attributeUIType) {
+ this.attributeUIType = attributeUIType;
+ }
+
+ public String getAttributeUITypeText() {
+ return attributeUITypeText;
+ }
+
+ public void setAttributeUITypeText(String attributeUITypeText) {
+ this.attributeUITypeText = attributeUITypeText;
+ }
+
@Override
public String toString() {
return "OsAttributeVO{" +
@@ -324,16 +386,21 @@
", description='" + description + '\'' +
", attributeDataType='" + attributeDataType + '\'' +
", attributeDataTypeText='" + attributeDataTypeText + '\'' +
+ ", attributeUIType='" + attributeUIType + '\'' +
+ ", attributeUITypeText='" + attributeUITypeText + '\'' +
", nullableFlag=" + nullableFlag +
", defaultValue='" + defaultValue + '\'' +
", enumId='" + enumId + '\'' +
", enumName='" + enumName + '\'' +
", btmTypeId='" + btmTypeId + '\'' +
", btmTypeName='" + btmTypeName + '\'' +
+ ", linkTypeName='" + linkTypeName + '\'' +
+ ", version=" + version +
", attrLength=" + attrLength +
", precisionLength=" + precisionLength +
", scaleLength=" + scaleLength +
", range='" + range + '\'' +
+ ", other='" + other + '\'' +
", btmname='" + btmname + '\'' +
", owner='" + owner + '\'' +
", creator='" + creator + '\'' +
--
Gitblit v1.9.3