Merge remote-tracking branch 'origin/master'

wangting

2023-08-01 ba8269fabd1d5af786a113120e5b4199d965d931

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/RoleMapper.java

@@ -49,6 +49,15 @@
   List<RoleVO> tree(String tenantId, String excludeRole);

   /**
    * 获取树形节点
    *
    * @param tenantId
    * @param excludeRole
    * @return
    */
   List<RoleVO> roleList(String tenantId);

   /**
    * 获取角色名
    *
    * @param ids