Merge branch 'jtwy' into dev_New

zss

44 分钟以前 2757f1d46f388f684aad93b3dc7ad805c45c6248

 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java

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

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

    @ApiModelProperty("创建时间")