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/DockingPreApplyFormDTO.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreApplyFormDTO.java
similarity index 65%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreApplyFormDTO.java
index 049e5af..4d2b304 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreApplyFormDTO.java
@@ -1,6 +1,7 @@
-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;
/**
* 璁板綍闆嗘垚灞炴暟鎹敵璇穒d
@@ -16,6 +17,11 @@
/***
* 闆嗗洟缂栫爜
*/
+ private String groupCode;
+ /***
+ * 閿欒鏍囪瘑鐮�
+ */
+
private String code;
/***
@@ -34,6 +40,11 @@
* 娑堟伅
*/
private String msg;
+
+ /**
+ * 鐢宠鍗曠被鍨�1:鐢宠锛�2锛氭洿鏀�
+ */
+ private String operationType;
public String getCode() {
return code;
@@ -75,14 +86,32 @@
this.msg = msg;
}
+ public String getOperationType() {
+ return operationType;
+ }
+
+ public void setOperationType(String operationType) {
+ this.operationType = operationType;
+ }
+
+ public String getGroupCode() {
+ return groupCode;
+ }
+
+ public void setGroupCode(String groupCode) {
+ this.groupCode = groupCode;
+ }
+
@Override
public String toString() {
- return "DockingPreApplyCodeFormVO{" +
- "code='" + code + '\'' +
+ return "DockingPreApplyFormDTO{" +
+ "groupCode='" + groupCode + '\'' +
+ ", code='" + code + '\'' +
", content='" + content + '\'' +
", dataOid='" + dataOid + '\'' +
", dataBtmName='" + dataBtmName + '\'' +
", msg='" + msg + '\'' +
+ ", operationType='" + operationType + '\'' +
'}';
}
}
--
Gitblit v1.9.3