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

xlsea

2024-12-16 4d566071db7853c66805a1ffac2fd9c93a6aac8a

 ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java

@@ -13,6 +13,6 @@
    /**
     * 是否脱敏
     */
    boolean isSensitive();
    boolean isSensitive(String[] roleKey, String[] perms);

}