Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb

liyong

8 天以前 ca0565e53494417b3779759f8d3898e07bfd5929

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

@@ -45,9 +45,9 @@
    private LocalDateTime maintenanceActuallyTime;

    @ApiModelProperty("保养结果 0 维修 1 完好")
    private Integer maintenanceResult;
    private String maintenanceResult;

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

    @ApiModelProperty("创建时间")