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

maven

14 小时以前 55c4143362c7df1ece4523597e26947d35e21bda

 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 {