Merge branch 'jtwy' into dev_New

zss

17 小时以前 fc830b7f62af651acedb8c11f1e2634fe2a3e497

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

@@ -42,7 +42,7 @@
    @ApiModelProperty("保养结果 0 维修 1 完好")
    private String maintenanceResult;

    @ApiModelProperty("状态 0 待保养 1 完结")
    @ApiModelProperty("状态 0 待保养 1 完结 2 失败")
    private Integer status;

    @ApiModelProperty("创建时间")