From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突
---
server/emaysms/src/main/java/cn/emay/sdk/util/GZIPUtils.java | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/server/emaysms/src/main/java/cn/emay/sdk/util/GZIPUtils.java b/server/emaysms/src/main/java/cn/emay/sdk/util/GZIPUtils.java
index a0d53e1..e2cf46b 100644
--- a/server/emaysms/src/main/java/cn/emay/sdk/util/GZIPUtils.java
+++ b/server/emaysms/src/main/java/cn/emay/sdk/util/GZIPUtils.java
@@ -56,8 +56,6 @@
/**
* 鏁版嵁鍘嬬缉
*
- * @param is
- * @param os
* @throws Exception
*/
public static byte[] compress(byte[] bytes) throws IOException {
@@ -82,8 +80,6 @@
/**
* 鏁版嵁瑙ｅ帇
- *
- * @param in
* @return
* @throws IOException
*/
--
Gitblit v1.9.3