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

maven

8 小时以前 5a5df7b6529a62233bd2541a9abbb7bd588e9a4d

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

@@ -49,7 +49,7 @@
    @ApiModelProperty("维修结果")
    private String maintenanceResult;

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

    @ApiModelProperty("创建时间")