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/dto/DockingPreClassifyDTO.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java
similarity index 68%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java
index 3a3403a..1021e7e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java
@@ -1,6 +1,8 @@
-package com.vci.ubcs.code.dto;
+package com.vci.ubcs.code.webservice.dto;
 
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.webservice.vo.BaseModelVO;
+
+import java.util.List;
 
 /***
  * 璁板綍闆嗗洟鍒嗙被淇℃伅
@@ -29,6 +31,10 @@
 	 * 鐖剁骇鑺傜偣
 	 */
 	private  String pid;
+	/**
+	 * 闆嗗洟鍒嗙被鍖呭惈鐨勬ā鍨嬭鍥�
+	 */
+	List<DockingPreViewModelDTO> dockingPreViewModelDTOList;
 
 	public String getClassName() {
 		return className;
@@ -62,6 +68,14 @@
 		this.pid = pid;
 	}
 
+	public List<DockingPreViewModelDTO> getDockingPreViewModelDTOList() {
+		return dockingPreViewModelDTOList;
+	}
+
+	public void setDockingPreViewModelDTOList(List<DockingPreViewModelDTO> dockingPreViewModelDTOList) {
+		this.dockingPreViewModelDTOList = dockingPreViewModelDTOList;
+	}
+
 	@Override
 	public String toString() {
 		return "DockingPreClassifyDTO{" +
@@ -69,6 +83,7 @@
 			", nodeLink='" + nodeLink + '\'' +
 			", getNodeLinkName='" + getNodeLinkName + '\'' +
 			", pid='" + pid + '\'' +
+			", dockingPreViewModelDTOList=" + dockingPreViewModelDTOList +
 			'}';
 	}
 }

--
Gitblit v1.9.3