Merge remote-tracking branch 'origin/master'

ludc

2024-02-24 344ada5bc3e41c5fb42ae0e8ac590b64b7cb04ca

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

@@ -146,7 +146,7 @@
    *
    * @return
    */
   List<Menu> getButtonByIdsOrByParentCode(@Param("roleIds") String roleIds, @Param("code") String code,@Param("ids") List<String> ids);
   List<Menu> getButtonByIdsOrByParentCode(@Param("roleIds") List<String> roleIds, @Param("code") String code,@Param("ids") List<String> ids);

   /**
    * 权限配置菜单