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

liyong

20 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

 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;