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

无关风月

2025-04-22 4010eccfd7a6e0f79041f9cb051c7f9d09bfdedc

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderInfoVO.java

@@ -22,6 +22,8 @@
    @ApiModelProperty("下单时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date placeOrderTime;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date completeTime;

    @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派)")
    private Integer state;