From 4a8c7756c66e2c5128dc9974ff7d3335deb903e4 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 03 一月 2025 14:18:48 +0800
Subject: [PATCH] merge
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMonitorDeviceController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMonitorDeviceController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMonitorDeviceController.java
index d29635b..31f9b05 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMonitorDeviceController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMonitorDeviceController.java
@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.List;
import java.util.Map;
/**
@@ -53,8 +54,8 @@
*/
@ApiOperation("实时监控列表")
@PostMapping("/monitor/page")
- public R<PageDTO<MwMonitorDeviceVO>> monitorPageList(@Valid @RequestBody MwMonitorDeviceQuery query) {
- return R.ok(mwMonitorDeviceService.pageMonitorPage(query));
+ public R<List<MwMonitorDeviceVO>> monitorPageList(@Valid @RequestBody MwMonitorDeviceQuery query) {
+ return R.ok(mwMonitorDeviceService.pageMonitorPage1(query).getList());
}
/**
--
Gitblit v1.7.1