fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -29,4 +29,10 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public List<TBanner> list(TBannerQuery query) {
        List<TBanner> list = this.baseMapper.list(query);
        return list;
    }
}