From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5

---
 rsf-server/src/main/java/com/vincent/rsf/server/common/utils/CommonUtil.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/CommonUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/CommonUtil.java
index 2a7f9e2..a5dc5d7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/CommonUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/CommonUtil.java
@@ -4,7 +4,7 @@
 import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.server.common.constant.Constants;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;

--
Gitblit v1.9.1