Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-09-06 f27bfd01251ea5ff742f0ad175b88c0c16bd5c8c

 src/main/java/com/mzl/flower/web/content/AdvertisementController.java

@@ -67,7 +67,7 @@

    @GetMapping("/page")
    @ApiOperation(value = "查询-分页", notes = "查询-分页")
    public ResponseEntity<ReturnDataDTO<Page<BannerDTO>>> queryPage(String title,String status, Page page) {
    public ResponseEntity<ReturnDataDTO<Page<AdvertisementDTO>>> queryPage(String title,String status, Page page) {
        return returnData(R.SUCCESS.getCode(), advertisementService.queryPage(title,status,page));
    }