From d44c1e2579e664009c75809ddc1e0231b7a68cb9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 25 八月 2023 11:04:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 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/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
similarity index 96%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
index ef66b57..5e0fa87 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/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -8,14 +8,13 @@
 import com.vci.base.ui.tree.VCIBaseTree;
 import com.vci.base.ui.tree.VCIBaseTreeModel;
 import com.vci.base.ui.tree.VCIBaseTreeNode;
+import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassify;
+import com.vci.rmip.code.client.codeapply.Apply410.object.R;
+import com.vci.rmip.code.client.codeapply.Apply410.object.TokenUserObject;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
-import com.vci.ubcs.codeapply.object.CodeClassify;
-import com.vci.ubcs.codeapply.object.R;
-import com.vci.ubcs.codeapply.object.TokenUserObject;
-import com.vci.ubcs.codeapply.utils.ConfigUtils;
-import com.vci.ubcs.codeapply.utils.HttpUtil;
-import com.vci.ubcs.system.user.entity.User;
 import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
 
@@ -69,7 +68,7 @@
 	private TransmitTreeObject transmitTreeObject = new TransmitTreeObject();
 
 
-	private String url=ConfigUtils.getConfigValue("410.code.url","http://127.0.0.1:36014/codeApplySwingController");
+	private String url= ConfigUtils.getConfigValue("410.code.url","http://127.0.0.1:36014/codeApplySwingController");
 
 	/***
 	 *

--
Gitblit v1.9.3