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/web/FileController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index f2b7f7a..0267db9 100644
--- a/src/main/java/com/zy/common/web/FileController.java
+++ b/src/main/java/com/zy/common/web/FileController.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
 

--
Gitblit v1.9.1