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/impl/TBannerServiceImpl.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBannerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBannerServiceImpl.java index 6dae322..7da7f08 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBannerServiceImpl.java +++ b/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; + } } -- Gitblit v1.7.1