From ecfcfe8ac671cd2f46dc8d9b9129e1851957b7c0 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 18 五月 2026 09:22:07 +0800
Subject: [PATCH] merge: 合并origin/dev_New_pro从bd86068d之后的所有提交

---
 src/main/java/com/ruoyi/framework/config/ServerConfig.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/src/main/java/com/ruoyi/framework/config/ServerConfig.java
index 157e9f4..4c1c476 100644
--- a/src/main/java/com/ruoyi/framework/config/ServerConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/ServerConfig.java
@@ -1,6 +1,6 @@
 package com.ruoyi.framework.config;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.utils.ServletUtils;
 

--
Gitblit v1.9.3