From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4

---
 src/main/java/com/mzl/flower/web/content/AdvertisementController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/web/content/AdvertisementController.java b/src/main/java/com/mzl/flower/web/content/AdvertisementController.java
index a823b2c..e5c69f9 100644
--- a/src/main/java/com/mzl/flower/web/content/AdvertisementController.java
+++ b/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));
     }
 

--
Gitblit v1.9.3