From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java
index a7a6898..7d59ab6 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java
@@ -3,8 +3,9 @@
 import com.vci.base.ui.swing.components.VCIJLabel;
 import com.vci.base.ui.swing.components.VCIJPanel;
 import com.vci.base.ui.swing.components.VCIJTextField;
-import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeShowFieldConfigVO;
 import com.vci.rmip.code.client.codeapply.Apply410.object.UIFormRefer;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.config.CodeShowFieldConfigVO;
+
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.awt.*;
@@ -74,7 +75,7 @@
 	 */
 	public Map<String,String> getAttrSearchFilterString(){
 		String result = "";
-		Map<String,String> customConditionMap=new HashMap<>();
+		Map<String,String> customConditionMap=new HashMap<String,String>();
 		Set<String> keys = attrInerNameValMap.keySet();
 		for (Iterator it = keys.iterator(); it.hasNext();) {
 			String key = (String)it.next();

--
Gitblit v1.9.3