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

zss

9 天以前 0629abbc318d5f78d2e91b45e4526d35a4ed8115

 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("创建时间")