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/DockingPreViewModelDTO.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreViewModelDTO.java
similarity index 63%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreViewModelDTO.java
index 779cee7..3fa725b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreViewModelDTO.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;
/**
* 璁板綍闆嗘垚闆嗗洟鍒嗙被瑙嗗浘淇℃伅
@@ -27,7 +29,10 @@
* 鏁版嵁xinx
*/
private String impactList;
-
+ /***
+ * 妯″瀷瑙嗗浘鍖呭惈鐨勫睘鎬�
+ */
+ private List<DockingPreMetaAttrDTO> dockingPreMetaAttrDTOList;
public String getViewName() {
return viewName;
@@ -53,12 +58,21 @@
this.impactList = impactList;
}
+ public List<DockingPreMetaAttrDTO> getDockingPreMetaAttrDTOList() {
+ return dockingPreMetaAttrDTOList;
+ }
+
+ public void setDockingPreMetaAttrDTOList(List<DockingPreMetaAttrDTO> dockingPreMetaAttrDTOList) {
+ this.dockingPreMetaAttrDTOList = dockingPreMetaAttrDTOList;
+ }
+
@Override
public String toString() {
- return "DockingPreViewModelVO{" +
+ return "DockingPreViewModelDTO{" +
"viewName='" + viewName + '\'' +
", sourceClassifyId='" + sourceClassifyId + '\'' +
", impactList='" + impactList + '\'' +
+ ", dockingPreMetaAttrDTOList=" + dockingPreMetaAttrDTOList +
'}';
}
}
--
Gitblit v1.9.3