From 41a77633d7be6d40195ce6fcb9a697bbc66e2fb5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 24 三月 2026 16:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

---
 src/main/java/com/ruoyi/common/core/text/CharsetKit.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
index 8297661..4fa575c 100644
--- a/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
+++ b/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))

--
Gitblit v1.9.3