From a19d26e88360c9760b2286bac4dfb1710fd2fa21 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期六, 12 八月 2023 13:33:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java
index 2cdfa93..a2e756b 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java
@@ -13,8 +13,8 @@
import com.vci.ubcs.codeapply.object.CodeClassify;
import com.vci.ubcs.codeapply.object.R;
import com.vci.ubcs.codeapply.utils.ConfigUtils;
+import com.vci.ubcs.codeapply.utils.HttpUtil;
import com.vci.ubcs.system.user.entity.User;
-import lombok.SneakyThrows;
import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
import org.apache.commons.collections4.CollectionUtils;
@@ -169,7 +169,7 @@
if(libName.length>0) {
condtionMap.put("libName", StringUtils.join(libName,",") );
}
- R r=HttpUtil.sendGet(url+"/getRMLibByName",condtionMap,new HashMap<>());
+ R r= HttpUtil.sendGet(url+"/getRMLibByName",condtionMap,new HashMap<>());
List<CodeClassify> codeClassifyList = new ArrayList<>();
if(r.isSuccess()){
Object object= r.getData();
@@ -388,4 +388,20 @@
public void setCurrentCodeClassifyTemplateVO(CodeClassifyTemplateVO currentCodeClassifyTemplateVO) {
this.currentCodeClassifyTemplateVO = currentCodeClassifyTemplateVO;
}
+
+ public CodeApplyFor410MainPanel getRightMainPanel() {
+ return rightMainPanel;
+ }
+
+ public void setRightMainPanel(CodeApplyFor410MainPanel rightMainPanel) {
+ this.rightMainPanel = rightMainPanel;
+ }
+
+ public TransmitTreeObject getTransmitTreeObject() {
+ return transmitTreeObject;
+ }
+
+ public void setTransmitTreeObject(TransmitTreeObject transmitTreeObject) {
+ this.transmitTreeObject = transmitTreeObject;
+ }
}
--
Gitblit v1.9.3