From 10215da99ee763cf72897c747f82efd4f9a513ad Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 20:32:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
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