From d7eba1786ed1fba2b3674f9da3af4fbf1a3f8692 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 01 六月 2023 18:49:05 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java
index bf7280d..1ebd13f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java
@@ -36,7 +36,10 @@
* 娑堟伅
*/
private String msg;
-
+ /***
+ * 鎿嶄綔绫诲瀷1锛氱敵璇� 2锛氭洿鏀�
+ */
+ private String operationType;
public String getCode() {
return code;
}
@@ -77,14 +80,32 @@
this.msg = msg;
}
+ public String getGroupCode() {
+ return groupCode;
+ }
+
+ public void setGroupCode(String groupCode) {
+ this.groupCode = groupCode;
+ }
+
+ public String getOperationType() {
+ return operationType;
+ }
+
+ public void setOperationType(String operationType) {
+ this.operationType = operationType;
+ }
+
@Override
public String toString() {
- return "DockingPreApplyCodeFormVO{" +
- "code='" + code + '\'' +
+ return "DockingPreApplyFormVO{" +
+ "groupCode='" + groupCode + '\'' +
+ ", code='" + code + '\'' +
", content='" + content + '\'' +
", dataOid='" + dataOid + '\'' +
", dataBtmName='" + dataBtmName + '\'' +
", msg='" + msg + '\'' +
+ ", operationType='" + operationType + '\'' +
'}';
}
}
--
Gitblit v1.9.3