Merge remote-tracking branch 'origin/master'

gongzuming

2024-08-26 1f2bf377f0c41e5ba9d3b0094034e5637d81d6f3

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