Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2024-01-31 3c0ccc88ffa8a651ec78a611ffe75775222ebf07

 screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -77,7 +77,7 @@
    }

    @Override
    public List<DeviceExcelDTO> ListDeviceExcel(String startTime, String endTime, int id) {
        return this.baseMapper.ListDeviceExcel(startTime,id);
    public List<DeviceExcelDTO> ListDeviceExcel(String startTime, String mon, int id) {
        return this.baseMapper.ListDeviceExcel(startTime,mon,id);
    }
}