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

liyong

2 天以前 79054eef527c991f9a84ab3bc3fd2603a5521eb1

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

@@ -27,13 +27,13 @@
    private String maintenancePlanTimeReq;

    @ApiModelProperty("计划保养日期")
    private LocalDateTime maintenancePlanTime;
    private String maintenancePlanTime;

    @ApiModelProperty("实际保养人")
    private String maintenanceActuallyName;

    @ApiModelProperty("实际保养日期")
    private LocalDateTime maintenanceActuallyTime;
    private String maintenanceActuallyTime;

    @ApiModelProperty("实际保养日期")
    private String maintenanceActuallyTimeReq;