From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 03 十二月 2024 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
index b13d963..3418674 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
@@ -814,7 +814,7 @@
if(c.isArray()){
return isBasicType(c.getComponentType());
}
- return ClassUtil.isPrimitive(c);
+ return ClassUtilForVCI.isPrimitive(c);
}
/**
@@ -1814,7 +1814,6 @@
return name;
}
-
/**
* 鏍规嵁涓氬姟绫诲瀷鑾峰彇琛ㄦ牸鍚嶇О
* @param btmname 涓氬姟绫诲瀷锛屽苟涓斾笉鑳芥槸瑙嗗浘
@@ -1878,7 +1877,7 @@
* @param replaceMap 浣跨敤鏇挎崲鐨勬暟鎹簮
* @return 鏇挎崲鍚庣殑鍊�
*/
- public static String replaceByFreeMarker(String freemarker,Map<String,String> replaceMap){
+ public static String replaceByFreeMarker(String freemarker,Map<String,Object> replaceMap){
if(StringUtils.isBlank(freemarker)){
return "";
}
--
Gitblit v1.9.3