Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-13 10df3eebf12aa53fe2f66af2dc75fcd0ef12251c

 ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java

@@ -2,6 +2,7 @@

import annotation.Log;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
@@ -36,7 +37,7 @@
    public TableDataInfo list(TMonitor tMonitor)
    {
        startPage();
        List<TMonitor> list = tMonitorService.selectTMonitorList(tMonitor);
        List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
        return getDataTable(list);
    }

@@ -48,8 +49,8 @@
    @PostMapping("/export")
    public void export(HttpServletResponse response, TMonitor tMonitor)
    {
        List<TMonitor> list = tMonitorService.selectTMonitorList(tMonitor);
        ExcelUtil<TMonitor> util = new ExcelUtil<TMonitor>(TMonitor.class);
        List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
        ExcelUtil<TMonitorVO> util = new ExcelUtil<TMonitorVO>(TMonitorVO.class);
        util.exportExcel(response, list, "设备资产数据");
    }