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

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

 ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/vo/OrderListVO.java

@@ -34,6 +34,9 @@
    @ApiModelProperty("回收服务id")
    private Integer serveId;

    @ApiModelProperty("虚假订单")
    private Integer fake;

    @ApiModelProperty("回收服务名称")
    private String serveName;

@@ -100,4 +103,5 @@
    public String getOrderIdStr() {
        return String.valueOf(getOrderId());
    }

}