fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -5,6 +5,8 @@
import com.ruoyi.system.model.TBanner;
import com.ruoyi.system.query.TBannerQuery;

import java.util.List;

/**
 * <p>
 * 轮播图管理 服务类
@@ -21,4 +23,5 @@
     * @return
     */
    PageInfo<TBanner> pageList(TBannerQuery query);
    List<TBanner> list(TBannerQuery query);
}