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

gongchunyi

2 天以前 2d1e904f3049218474318cb1e2fe5c3a3869cfb0

 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;