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

liyong

8 天以前 cf17e9b3e34d1f14f5b9ed41e4eeb82c744cb218

 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java

@@ -6,7 +6,6 @@
import lombok.Data;

import java.time.LocalDateTime;
import java.util.Date;

@Data
public class DeviceMaintenanceDto {