From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TBannerService.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBannerService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBannerService.java
index b2ed584..9b7b161 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBannerService.java
+++ b/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);
}
--
Gitblit v1.7.1