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

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

 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("endTime") String endTime,@Param("id") int id);
    List<DeviceExcelDTO> ListDeviceExcel(@Param("startTime") String startTime,@Param("mon") String mon,@Param("id") int id);
}