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

无关风月

2025-04-17 24dc501ed2eca9ffa890784c9028b5ac954c2faa

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java

@@ -117,7 +117,7 @@
    @TableField("reservation_remark")
    private String reservationRemark;

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