From 37f41a7c17d81a60092e9d69363905f21d9b1a49 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 19 三月 2024 17:34:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 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 6245c2d..6b1267f 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
@@ -1,20 +1,21 @@
 package com.ycl.platform.mapper;
 
-import com.ycl.platform.entity.TMonitor;
+import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.vo.TMonitorVO;
 
 import java.util.List;
 
 /**
  * 璁惧璧勪骇Mapper鎺ュ彛
- * 
+ *
  * @author ruoyi
  * @date 2024-03-04
  */
-public interface TMonitorMapper 
+public interface TMonitorMapper
 {
     /**
      * 鏌ヨ璁惧璧勪骇
-     * 
+     *
      * @param id 璁惧璧勪骇涓婚敭
      * @return 璁惧璧勪骇
      */
@@ -22,15 +23,15 @@
 
     /**
      * 鏌ヨ璁惧璧勪骇鍒楄〃
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 璁惧璧勪骇闆嗗悎
      */
-    public List<TMonitor> selectTMonitorList(TMonitor tMonitor);
+    public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor);
 
     /**
      * 鏂板璁惧璧勪骇
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 缁撴灉
      */
@@ -38,7 +39,7 @@
 
     /**
      * 淇敼璁惧璧勪骇
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 缁撴灉
      */
@@ -46,7 +47,7 @@
 
     /**
      * 鍒犻櫎璁惧璧勪骇
-     * 
+     *
      * @param id 璁惧璧勪骇涓婚敭
      * @return 缁撴灉
      */
@@ -54,7 +55,7 @@
 
     /**
      * 鎵归噺鍒犻櫎璁惧璧勪骇
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
      * @return 缁撴灉
      */

--
Gitblit v1.8.0