From db1c3c5b3670639fd1dfc5de0fe75ce6f02f732e Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 31 五月 2023 14:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreViewModelVO.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreViewModelVO.java
similarity index 68%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreViewModelVO.java
index 3421693..be07f0b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreViewModelVO.java
@@ -1,4 +1,7 @@
-package com.vci.ubcs.code.vo.pagemodel;
+package com.vci.ubcs.code.webservice.vo;
+
+import java.util.List;
+
 /**
  * 璁板綍闆嗘垚闆嗗洟鍒嗙被瑙嗗浘淇℃伅
  * @author xiejun
@@ -24,8 +27,10 @@
 	 * 鏁版嵁xinx
 	 */
 	private  String impactList;
-
-
+	/***
+	 * 妯″瀷瑙嗗浘鍖呭惈鐨勫睘鎬�
+	 */
+	private List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList;
 	public String getViewName() {
 		return viewName;
 	}
@@ -50,12 +55,21 @@
 		this.impactList = impactList;
 	}
 
+	public List<DockingPreMetaAttrVO> getDockingPreMetaAttrVOList() {
+		return dockingPreMetaAttrVOList;
+	}
+
+	public void setDockingPreMetaAttrVOList(List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList) {
+		this.dockingPreMetaAttrVOList = dockingPreMetaAttrVOList;
+	}
+
 	@Override
 	public String toString() {
 		return "DockingPreViewModelVO{" +
 			"viewName='" + viewName + '\'' +
 			", sourceClassifyId='" + sourceClassifyId + '\'' +
 			", impactList='" + impactList + '\'' +
+			", dockingPreMetaAttrVOList=" + dockingPreMetaAttrVOList +
 			'}';
 	}
 }

--
Gitblit v1.9.3