Merge remote-tracking branch 'origin/master'

xiejun

2023-08-25 0316a18c450d79c356509f96767854f008e1a2a6

 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