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

LiuHao

2024-03-08 598ece677dc38ccc4b8e63738e198b669ec05558

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

}