sync -- 同步 RuoYi-Vue-Plus（v4.3.0）更新

2022-09-18 23:27:06 +08:00
parent 4bc7e08889
commit ccf8393808
254 changed files with 3697 additions and 2679 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
@@ -5,6 +5,8 @@ import java.lang.annotation.*;
 /**
 * 数据权限
 *
+ * 一个注解只能对应一个模板
+ *
 * @author Lion Li
 * @version 3.5.0
 */
@@ -16,11 +18,11 @@ public @interface DataColumn {
    /**
     * 占位符关键字
     */
-    String key() default "deptName";
+    String[] key() default "deptName";

    /**
     * 占位符替换值
     */
-    String value() default "dept_id";
+    String[] value() default "dept_id";

 }