Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

2026-05-21 798a2095478f5368377d0121fb17e991ed04c56c

 src/main/java/com/ruoyi/common/core/text/CharsetKit.java

@@ -66,7 +66,7 @@


        if (null == destCharset)

        {

            srcCharset = StandardCharsets.UTF_8;

            destCharset = StandardCharsets.UTF_8;

        }



        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))