Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-29 62d15798697cc6afdb02a0e0a893baadb9e66044

 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;
        });
    }