Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

2026-04-25 0d9b0dab20eae44c817944e98c967dfd8832f580

 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;