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

LiuHao

2024-03-07 e7907a4664e7c2ff81e6244308716cfeaeaf8993

 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);

}