From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java |   21 ++++++++-------------
 1 files changed, 8 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..feaa3f4 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,10 +1,6 @@
 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.*;
 
 /**
  * 鏁版嵁鏉冮檺杩囨护娉ㄨВ
@@ -14,20 +10,19 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface DataScope
-{
+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