Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

huminmin

昨天 c924d59a94fc17d570610cbf2b691481dd0b2e4d

 src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java

@@ -37,7 +37,7 @@
    @Excel(name = "保养结果")
    private String maintenanceResult;

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