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

yupeng

2025-03-13 96a7015065775e5c3bc3d6458b86b28ad7bfb46b

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java

@@ -46,7 +46,7 @@
    }

    @Override
    public List<TItemTypeVO> getItemList() {
        return this.baseMapper.getItemList();
    public List<TItemTypeVO> getItemList(String itemName) {
        return this.baseMapper.getItemList(itemName);
    }
}