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

buhuazhen

6 天以前 306a7bb0c562a97b52bbc411774303ccf5f07374

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