Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

6 天以前 66c6ab9883ecb5e0595f02fec6b66e962d1fbf67

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