From c4d687aacfb4e7b6ee5ce67df93cf2f8d8df80c1 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期日, 26 十一月 2023 14:05:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/VciBaseUtil.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/VciBaseUtil.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/VciBaseUtil.java
index 883dfd6..55a3a9d 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/VciBaseUtil.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/VciBaseUtil.java
@@ -321,7 +321,7 @@
}
public static String list2String(List<String> ls) {
- return ls != null && ls.size() != 0 ? (String) org.apache.commons.lang.StringUtils.join(ls,"") : "";
+ return ls != null && ls.size() != 0 ? (String) StringUtils.join(ls,"") : "";
}
public static boolean isNull(String o) {
@@ -890,7 +890,7 @@
sameMethods.add(mthod);
}
}
-
+
return !CollectionUtils.isEmpty(sameMethods) ? (Method)sameMethods.get(0) : null;
}
--
Gitblit v1.9.3