Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-manag...

chenhj

5 小时以前 7488018d52edaafcd4e541c5fdeada8dd2e47b11

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