From 9e0d36344ed128099284e3936a0b124fb734e981 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 19 八月 2024 17:58:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
index 5bc6c34..2a6592c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -127,7 +127,7 @@
      * @param page
      * @param query
      */
-    void assetManagement(IPage<TMonitorVO> page, @Param("query") DataCenterQuery query);
+    IPage assetManagement(IPage<TMonitorVO> page, @Param("query") DataCenterQuery query);
 
     void deleteAll();
 

--
Gitblit v1.8.0