fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -10,6 +10,7 @@
import com.ruoyi.system.query.TItemTypeQuery;
import com.ruoyi.system.service.TItemTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.TItemTypeVO;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -43,4 +44,9 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }

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