From 9e8ce689c89c4b03bfc67a60d7da13a7d593725a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 20:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
index 7ad25e6..a317cf5 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
@@ -83,13 +83,16 @@
     public ResultUtil<List<BannerVo>> queryBannerList(Integer position){
         try {
             List<Banner> list = bannerService.list(new QueryWrapper<Banner>().eq("position", position).eq("state", 1).orderByAsc("sort"));
-            List<BannerVo> list1 = new ArrayList<>();
-            for (Banner banner : list) {
-                BannerVo bannerVo = new BannerVo();
-                BeanUtils.copyProperties(banner, bannerVo);
-                list1.add(bannerVo);
-            }
-            return ResultUtil.success(list1);
+
+            List<BannerVo> list2 = bannerService.list1(position);
+
+//            List<BannerVo> list1 = new ArrayList<>();
+//            for (Banner banner : list2) {
+//                BannerVo bannerVo = new BannerVo();
+//                BeanUtils.copyProperties(banner, bannerVo);
+//                list1.add(bannerVo);
+//            }
+            return ResultUtil.success(list2);
         }catch (Exception e){
             e.printStackTrace();
             return ResultUtil.runErr();

--
Gitblit v1.7.1