From cdba4febf23c6f55346a474579361923aacf0bc9 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 02 十二月 2024 14:54:11 +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 |    3 +--
 1 files changed, 1 insertions(+), 2 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..ab20ea1 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
@@ -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