From 663e22ac294acf7a26ab2307b04ddd24700fd88b Mon Sep 17 00:00:00 2001 From: Simple <2424585654@qq.com> Date: 星期二, 12 十二月 2023 16:58:24 +0800 Subject: [PATCH] fix 修复 excel合并注解会根据第一合并列的结果来决定后续的列合并 --- ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java index f2def8a..1dfc896 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java +++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java @@ -21,4 +21,8 @@ @JsonSerialize(using = SensitiveHandler.class) public @interface Sensitive { SensitiveStrategy strategy(); + + String roleKey() default ""; + + String perms() default ""; } -- Gitblit v1.9.3