Merge remote-tracking branch 'origin/master' into xizang-changyun

yupeng

2025-02-26 6f97a42dccaedb7a8950feac205080e63d8be439

 ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java

@@ -32,5 +32,5 @@
     */
    PageInfo<TItemType> pageList(TItemTypeQuery query);

    List<TItemTypeVO> getItemList();
    List<TItemTypeVO> getItemList(String itemName);
}