From b3c3afc2b4af331bbd6ac60f16be9fd6563f7ca0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 15 十二月 2021 14:12:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
index 155f7c3..f1a4f9f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
@@ -1,33 +1,32 @@
package com.ruoyi.common.annotation;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
/**
* 鏁版嵁鏉冮檺杩囨护娉ㄨВ
*
* @author ruoyi
+ * @deprecated 3.6.0 绉婚櫎 {@link com.ruoyi.common.annotation.DataPermission}
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
-public @interface DataScope
-{
+@Deprecated
+public @interface DataScope {
+
/**
* 閮ㄩ棬琛ㄧ殑鍒悕
*/
- public String deptAlias() default "";
+ String deptAlias() default "";
/**
* 鐢ㄦ埛琛ㄧ殑鍒悕
*/
- public String userAlias() default "";
+ String userAlias() default "";
- /**
- * 鏄惁杩囨护鐢ㄦ埛鏉冮檺
- */
- public boolean isUser() default false;
+ /**
+ * 鏄惁杩囨护鐢ㄦ埛鏉冮檺
+ */
+ boolean isUser() default false;
+
}
--
Gitblit v1.9.3