Merge branch 'dev_New_pro' into dev_天津_宝东pro

云

2026-05-22 b97cf434154939778e71089b26efe5762cab80be

 src/main/java/com/ruoyi/common/utils/ServletUtils.java

@@ -7,10 +7,10 @@
import java.util.Collections;

import java.util.HashMap;

import java.util.Map;

import javax.servlet.ServletRequest;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;

import javax.servlet.http.HttpSession;

import jakarta.servlet.ServletRequest;

import jakarta.servlet.http.HttpServletRequest;

import jakarta.servlet.http.HttpServletResponse;

import jakarta.servlet.http.HttpSession;

import org.springframework.web.context.request.RequestAttributes;

import org.springframework.web.context.request.RequestContextHolder;

import org.springframework.web.context.request.ServletRequestAttributes;