Merge remote-tracking branch 'origin/cjl' into dev

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

 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);
    }
}