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/CodeDataMainPanelDataProvider.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanelDataProvider.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
similarity index 90%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanelDataProvider.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
index 1c0b245..23c6a08 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanelDataProvider.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
@@ -1,20 +1,20 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
 
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.vci.base.ui.swing.components.table.AbstractVCIJTableDataProvider;
 import com.vci.base.ui.swing.components.table.VCIJTableNode;
-import com.vci.ubcs.codeapply.object.BaseModel;
-import com.vci.ubcs.codeapply.object.Page;
+import com.vci.rmip.code.client.codeapply.Apply410.object.BaseModel;
+import com.vci.rmip.code.client.codeapply.Apply410.object.Page;
+import com.vci.rmip.code.client.codeapply.Apply410.object.R;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.vci.base.ui.swing.VCIOptionPane;
 import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeShowFieldConfigVO;
 import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeSrchCondConfigVO;
-import com.vci.ubcs.codeapply.object.R;
-import com.vci.ubcs.codeapply.object.UIFormRefer;
-import com.vci.ubcs.codeapply.utils.ConfigUtils;
-import com.vci.ubcs.codeapply.utils.HttpUtil;
+import com.vci.rmip.code.client.codeapply.Apply410.object.UIFormRefer;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;

--
Gitblit v1.9.3