From 1901a22a3b2d7a2a076b69ecd78d24ec55d5a3e8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
index f1b7859..3ac12c1 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
@@ -34,7 +34,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:monitor:list')")
@GetMapping("/list")
- public TableDataInfo list(TMonitor tMonitor)
+ public TableDataInfo list(TMonitorVO tMonitor)
{
startPage();
List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
@@ -47,7 +47,7 @@
@PreAuthorize("@ss.hasPermi('system:monitor:export')")
@Log(title = "璁惧璧勪骇", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, TMonitor tMonitor)
+ public void export(HttpServletResponse response, TMonitorVO tMonitor)
{
List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
ExcelUtil<TMonitorVO> util = new ExcelUtil<TMonitorVO>(TMonitorVO.class);
--
Gitblit v1.8.0