From 88c5cf35a5ea870378d7964086ed2c09ddc299c8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 九月 2024 17:52:05 +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 |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 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 1cad6e4..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;
 
     /**
      * 鏄惁鍙互涓虹┖
@@ -353,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{" +
@@ -362,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