Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-19 37f41a7c17d81a60092e9d69363905f21d9b1a49

 ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java

@@ -1,6 +1,7 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.vo.TMonitorVO;

import java.util.List;

@@ -26,7 +27,7 @@
     * @param tMonitor 设备资产
     * @return 设备资产集合
     */
    public List<TMonitor> selectTMonitorList(TMonitor tMonitor);
    public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor);

    /**
     * 新增设备资产