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

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/system/service/IRoleService.java

@@ -124,4 +124,12 @@
    * @return
    */
    List<Role> getRoleList(RoleParam roleParam);

   /**
    * 查询对应的角色id
    * @param roleId
    * @param type 登录类型 2：pc 3：app
    * @return
    */
   List<String> getRoleIdStrByRoleIdAndType(String roleId,Integer type);
}