Merge remote-tracking branch 'origin/dev' into dev

AprilWind

2024-05-27 1bd40a0cff850e1c6dd41c6c606d48d31b9b76f6

 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 "";
}