Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

6 天以前 01d728d8aa257c5601039030f16ba0213bc6e501

 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))