From 889842eb8b64a0b72c449ce23ff21e4e8c935cae Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 26 七月 2024 16:06:49 +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 |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 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..1cad6e4 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
@@ -64,7 +64,6 @@
      */
     private String enumName;
 
-
     /**
      * 鍙傜収鐨勪笟鍔$被鍨嬬紪鍙�
      */
@@ -74,6 +73,16 @@
      * 鍙傜収鐨勪笟鍔$被鍨嬪悕绉�
      */
     private String btmTypeName;
+
+    /**
+     * 鍙傜収鐨勯摼鎺ョ被鍨嬪悕绉�
+     */
+    private String linkTypeName;
+
+    /**
+     * 閫夋嫨浜嗛摼鎺ョ被鍨嬫椂閫夋嫨鐨勭増鏈�
+     */
+    private Integer version;
 
     /**
      * 灞炴�х殑闀垮害
@@ -96,7 +105,12 @@
     private String range;
 
     /**
-     * 涓氬姟绫诲瀷鍚嶇О,鏄�艰繖鏉℃暟鎹殑涓氬姟绫诲瀷锛屼笉鏄睘鎬ф墍灞炵殑涓氬姟绫诲瀷
+     * 瀛楁涓哄弬鐓ф椂鍙傜収鐨勭浉鍏冲睘鎬�
+     */
+    private String other;
+
+    /**
+     * 涓氬姟绫诲瀷鍚嶇О,鏄�艰繖鏉℃暟鎹殑涓氬姟绫诲瀷锛屼笉鏄睘鎬ф墍灞炵殑涓氬姟绫诲瀷锛屽簲璇ユ槸涓氬姟绫诲瀷涓哄睘鎬ф睜
      */
     private String btmname;
 
@@ -129,6 +143,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 +248,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;
     }

--
Gitblit v1.9.3