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

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

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

@@ -51,6 +51,7 @@
    @TableField("state")
    private Integer state;


    @ApiModelProperty("订单id")
    @TableField("order_id")
    private String orderId;
@@ -75,6 +76,12 @@
    @ApiModelProperty("城市编码")
    @TableField("city_code")
    private String cityCode;
    @TableField(exist = false)
    private String reservationName;
    @TableField(exist = false)
    private String reservationPhone;
    @TableField(exist = false)
    private String reservationAddress;


}