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

liyong

2026-01-30 7193fdcb256c3836393bff9c3ab0efe4fa56a3c0

 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;