From 6368a855afb72f3c23eed5aedd085c55fe7a2d9f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 10:02:43 +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 | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 5c317de..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
@@ -84,15 +84,15 @@
try {
List<Banner> list = bannerService.list(new QueryWrapper<Banner>().eq("position", position).eq("state", 1).orderByAsc("sort"));
- List<Banner> list2 = bannerService.list1(position);
+ 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(list1);
+// 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