Merge branch 'dev_dz' into dev

zhuo

2025-03-07 a24095d096e7ab1f83e44aa8054d0f673db05b38

 ruoyi-common/src/main/java/com/ruoyi/common/utils/GZipUtil.java

@@ -28,8 +28,7 @@

            return new String(out.toByteArray(), "iso-8859-1");
        } catch (Exception e) {
            e.printStackTrace();
            return str;
            throw new RuntimeException("数据压缩失败");
        }

    }
@@ -55,8 +54,7 @@

            return new String(out.toByteArray(), "utf-8");
        } catch (Exception e) {
            e.printStackTrace();
            return str;
            throw new RuntimeException("数据解压失败");
        }

    }