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/mapper/DeviceMapper.java

@@ -17,5 +17,5 @@
 */
public interface DeviceMapper extends BaseMapper<Device> {

    List<DeviceExcelDTO> ListDeviceExcel(@Param("startTime") String startTime,@Param("id") int id);
    List<DeviceExcelDTO> ListDeviceExcel(@Param("startTime") String startTime,@Param("mon") String mon,@Param("id") int id);
}