From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/common/aop/DataScopeAop.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/aop/DataScopeAop.java b/src/main/java/com/ruoyi/common/aop/DataScopeAop.java
index f77ca63..1c73e9b 100644
--- a/src/main/java/com/ruoyi/common/aop/DataScopeAop.java
+++ b/src/main/java/com/ruoyi/common/aop/DataScopeAop.java
@@ -10,8 +10,8 @@
import org.springframework.web.multipart.MultipartFile;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.util.Collection;
@@ -150,7 +150,7 @@
|| ServletRequest.class.isAssignableFrom(type)
|| ServletResponse.class.isAssignableFrom(type)
|| packageName.startsWith("java.")
- || packageName.startsWith("javax.")
+ || packageName.startsWith("jakarta.")
|| packageName.startsWith("jakarta.")
|| packageName.startsWith("org.springframework.")
|| packageName.startsWith("com.baomidou.");
--
Gitblit v1.9.3