From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
index 53e6716..f59fe7f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
@@ -185,7 +185,8 @@
     @Override
     public List<BannerDTO> findShopBanner() {
         Banner banner = new Banner();
-        banner.setPosition(Constants.TWO);
+        banner.setPosition(Constants.ZERO);
+        banner.setIsdeleted(Constants.ZERO);
         QueryWrapper<Banner> wrapper = new QueryWrapper<>(banner);
         wrapper.lambda().orderByDesc(Banner::getSortnum);
         List<Banner> banners = bannerMapper.selectList(wrapper);
@@ -194,9 +195,6 @@
             BannerDTO dto = new BannerDTO();
             BeanUtils.copyProperties(s, dto);
             dto.setImgurl(path + s.getImgurl());
-            if (Constants.equalsInteger(dto.getType(),Constants.ZERO)){
-                dto.setContent(null);
-            }
             return dto;
         }).collect(Collectors.toList());
         return collect;

--
Gitblit v1.9.3