Merge remote-tracking branch 'origin/shuttle_rcs' into shuttle_rcs

taisheng

7 天以前 a5fd6b72f8342f0228321849b04c822feba2d2a0

 src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java

@@ -10,7 +10,7 @@
@Repository
public interface DeviceDataLogMapper extends BaseMapper<DeviceDataLog> {

    @Delete("delete from wcs_device_data_log where create_time < DATEADD(HOUR, -24, GETDATE())")
    @Delete("delete from wcs_device_data_log where create_time < FROM_UNIXTIME(UNIX_TIMESTAMP() - (24 * 60 * 60))")
    int clearLog();

}