Merge branch 'dev_New_pro' into dev_pro_河南鹤壁

yuan

9 天以前 893fda1fa8bc17002a866381e8940e1c31d11d93

 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;