From b32bad4b54373a9e71e3118756ecb6fb918d1450 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期日, 29 三月 2026 19:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-jxthTV

---
 src/main/java/com/zy/common/utils/Http.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/Http.java b/src/main/java/com/zy/common/utils/Http.java
index b0f9672..5f08a69 100644
--- a/src/main/java/com/zy/common/utils/Http.java
+++ b/src/main/java/com/zy/common/utils/Http.java
@@ -5,7 +5,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.core.common.R;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
 
 /**

--
Gitblit v1.9.1