From a617006079e833b174f3223dee1e0266aa3ac2d8 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 03 二月 2026 21:23:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-common/xp-common-datascope/src/main/java/com/xiaopeng/common/datascope/aspect/DataScopeAspect.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xp-common/xp-common-datascope/src/main/java/com/xiaopeng/common/datascope/aspect/DataScopeAspect.java b/xp-common/xp-common-datascope/src/main/java/com/xiaopeng/common/datascope/aspect/DataScopeAspect.java
index ab5502e..756afdc 100644
--- a/xp-common/xp-common-datascope/src/main/java/com/xiaopeng/common/datascope/aspect/DataScopeAspect.java
+++ b/xp-common/xp-common-datascope/src/main/java/com/xiaopeng/common/datascope/aspect/DataScopeAspect.java
@@ -2,6 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
+import com.xiaopeng.api.model.account.SysRole;
+import com.xiaopeng.api.model.account.SysUser;
+import com.xiaopeng.api.vo.account.LoginUser;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
@@ -12,8 +16,6 @@
 import com.xiaopeng.common.core.web.domain.BaseEntity;
 import com.xiaopeng.common.datascope.annotation.DataScope;
 import com.xiaopeng.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
 
 /**
  * 数据过滤处理

--
Gitblit v1.7.1