Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-06 c28b679fb769c7f0b5a462b7effeae5e25798534

 src/main/java/com/mzl/flower/service/content/AdvertisementService.java

@@ -80,6 +80,7 @@
        return advertisementMapper.selectPage(page, wrapper).convert(item -> {
               AdvertisementDTO advertisementDTO = new AdvertisementDTO();
               BeanUtils.copyProperties(item, advertisementDTO);
               advertisementDTO.setContent(null);
               return advertisementDTO;
        });
    }